fix a possible panic on cache

``` newDesc.Annotations = nil for _, k := range addAnnotations { newDesc.Annotations[k] = desc.Annotations[k] } ``` The codes may cause buildkitd panic: assignment to entry in nil map Signed-off-by: Yan Song <[email protected]> (cherry picked from commit 39bd8c6)
moby · Feb 28, 2023 · 99aaa10 · 99aaa10
1 parent c327eb8
commit 99aaa10
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/cache/remote.go b/cache/remote.go
@@ -228,13 +228,13 @@ func (sr *immutableRef) getRemote(ctx context.Context, createIfNeeded bool, refC
 				newDesc.Size = blobDesc.Size
 				newDesc.URLs = blobDesc.URLs
 				newDesc.Annotations = nil
+				if len(addAnnotations) > 0 || len(blobDesc.Annotations) > 0 {
+					newDesc.Annotations = make(map[string]string)
+				}
 				for _, k := range addAnnotations {
 					newDesc.Annotations[k] = desc.Annotations[k]
 				}
 				for k, v := range blobDesc.Annotations {
-					if newDesc.Annotations == nil {
-						newDesc.Annotations = make(map[string]string)
-					}
 					newDesc.Annotations[k] = v
 				}
 				desc = newDesc