github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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

Browse Source 
Fix panic in metadata content writer on copy error
This commit is contained in:
Phil Estes 2021-09-23 17:42:11 -04:00 committed by GitHub
commit c5e23649df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
metadata/content.go
View File

@ -558,13 +558,13 @@ func (nw *namespacedWriter) createAndCopy(ctx context.Context, desc ocispec.Desc
if desc.Size > 0 { if desc.Size > 0 {
ra, err := nw.provider.ReaderAt(ctx, nw.desc) ra, err := nw.provider.ReaderAt(ctx, nw.desc)
if err != nil { if err != nil {
w.Close()
return err return err
} }
defer ra.Close() defer ra.Close()
if err := content.CopyReaderAt(w, ra, desc.Size); err != nil { if err := content.CopyReaderAt(w, ra, desc.Size); err != nil {
nw.w.Close() w.Close()
nw.w = nil
return err return err
} }
} }