Merge pull request #1140 from oiooj/pr-panic

bugfix: fix daemon panic when meta snapshotter is nil
AliyunContainerService · Apr 17, 2018 · 5f57ba3 · 5f57ba3
2 parents 205fc5c + 19c68e9
commit 5f57ba3
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/daemon/mgr/container.go b/daemon/mgr/container.go
@@ -1305,7 +1305,9 @@ func (mgr *ContainerManager) markStoppedAndRelease(c *Container, m *ctrd.Message
 	// delete the containerd container, the merged dir
 	// will also be deleted, so we should unset the
 	// container's MergedDir.
-	c.meta.Snapshotter.Data["MergedDir"] = ""
+	if c.meta.Snapshotter != nil && c.meta.Snapshotter.Data != nil {
+		c.meta.Snapshotter.Data["MergedDir"] = ""
+	}
 
 	// update meta
 	if err := c.Write(mgr.Store); err != nil {