Merge pull request #10882 from LK4D4/fix_possible_panic_on_kill
Fix possible panic on killing container Upstream-commit: d12593601558ca090864b54e1a2e519f6763e2fb Component: engine
This commit is contained in:
@ -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))
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user