Merge pull request #6045 from dmcgowan/1.5-fix-metadata-content-panic

estesp · web-flow · commit 063195739c21 · 2021-09-24T10:36:51.000-04:00
[release/1.5] Fix panic in metadata content writer on copy error
diff --git a/metadata/content.go b/metadata/content.go
@@ -551,13 +551,13 @@ func (nw *namespacedWriter) createAndCopy(ctx context.Context, desc ocispec.Desc
 	if desc.Size > 0 {
 		ra, err := nw.provider.ReaderAt(ctx, nw.desc)
 		if err != nil {
+			w.Close()
 			return err
 		}
 		defer ra.Close()
 
 		if err := content.CopyReaderAt(w, ra, desc.Size); err != nil {
-			nw.w.Close()
-			nw.w = nil
+			w.Close()
 			return err
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -551,13 +551,13 @@ func (nw *namespacedWriter) createAndCopy(ctx context.Context, desc ocispec.Desc`
`551`	`551`	`if desc.Size > 0 {`
`552`	`552`	`ra, err := nw.provider.ReaderAt(ctx, nw.desc)`
`553`	`553`	`if err != nil {`
	`554`	`+ w.Close()`
`554`	`555`	`return err`
`555`	`556`	`}`
`556`	`557`	`defer ra.Close()`
`557`	`558`
`558`	`559`	`if err := content.CopyReaderAt(w, ra, desc.Size); err != nil {`
`559`		`- nw.w.Close()`
`560`		`- nw.w = nil`
	`560`	`+ w.Close()`
`561`	`561`	`return err`
`562`	`562`	`}`
`563`	`563`	`}`