Merge pull request #1565 from allencloud/fix-potential-panic

fix a potential panic when map is nil
containerd · Sep 27, 2017 · b24acea · b24acea
2 parents cc9f58a + 382dafe
commit b24acea
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/image.go b/image.go
@@ -80,10 +80,10 @@ func (i *image) Unpack(ctx context.Context, snapshotterName string) error {
 			if err != nil {
 				return err
 			}
+			if info.Labels == nil {
+				info.Labels = map[string]string{}
+			}
 			if info.Labels["containerd.io/uncompressed"] != layer.Diff.Digest.String() {
-				if info.Labels == nil {
-					info.Labels = map[string]string{}
-				}
 				info.Labels["containerd.io/uncompressed"] = layer.Diff.Digest.String()
 				if _, err := cs.Update(ctx, info, "labels.containerd.io/uncompressed"); err != nil {
 					return err