docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10882 from LK4D4/fix_possible_panic_on_kill 

Fix possible panic on killing container
This commit is contained in:
Jessie Frazelle 2015-02-19 11:09:31 -08:00
parent a4b04544b7 e995670935
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 ( import (
"encoding/json" "encoding/json"
"errors"
"fmt" "fmt"
"io" "io"
"io/ioutil" "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 { 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)) return syscall.Kill(p.ProcessConfig.Process.Pid, syscall.Signal(sig))
} }