0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #10882 from LK4D4/fix_possible_panic_on_kill

Browse source 
Fix possible panic on killing container
This commit is contained in:
Jessie Frazelle 2015-02-19 11:09:31 -08:00
commit d125936015
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
daemon/execdriver/native/driver.go
View file

@ -4,6 +4,7 @@ package native
import (
"encoding/json"
"errors"
"fmt"
"io"
"io/ioutil"
@ -173,6 +174,9 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba
}
func (d *driver) Kill(p *execdriver.Command, sig int) error {
if p.ProcessConfig.Process == nil {
return errors.New("exec: not started")
}
return syscall.Kill(p.ProcessConfig.Process.Pid, syscall.Signal(sig))
}