From 4cbb9e0f0dc2ef5d1739e965fbbb7e8be4cbccc3 Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Sat, 23 Mar 2013 19:51:35 -0700 Subject: [PATCH] Prevent container.Kill() from crashing if container.cmd is nil Upstream-commit: b32436cd2ea1f206cf5758170172f46dafb1f43c Component: engine --- components/engine/container.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/engine/container.go b/components/engine/container.go index f900599d00..bd5e10ac5b 100644 --- a/components/engine/container.go +++ b/components/engine/container.go @@ -356,6 +356,9 @@ func (container *Container) monitor() { } func (container *Container) kill() error { + if container.cmd == nil { + return nil + } if err := container.cmd.Process.Kill(); err != nil { return err }