Merge pull request #1556 from sanimej/nilsb

Add a nil check before accessing sandbox.osSbox
moby · Nov 16, 2016 · 7c591f9 · 7c591f9
2 parents be377dc + 95c683b
commit 7c591f9
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/sandbox.go b/sandbox.go
@@ -427,7 +427,13 @@ func (sb *sandbox) ResolveIP(ip string) string {
 }
 
 func (sb *sandbox) ExecFunc(f func()) error {
-	return sb.osSbox.InvokeFunc(f)
+	sb.Lock()
+	osSbox := sb.osSbox
+	sb.Unlock()
+	if osSbox != nil {
+		return osSbox.InvokeFunc(f)
+	}
+	return fmt.Errorf("osl sandbox unavailable in ExecFunc for %v", sb.ContainerID())
 }
 
 func (sb *sandbox) ResolveService(name string) ([]*net.SRV, []net.IP) {