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

remotes/docker/fetcher.go: Fix missing Close()

Browse Source 
Signed-off-by: Shiming Zhang <wzshiming@foxmail.com>
This commit is contained in:
Shiming Zhang 2021-07-21 10:28:47 +08:00
parent b809212b18
commit 67d07fe5cf
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
remotes/docker/fetcher.go
View File

@ -148,7 +148,7 @@ func (r dockerFetcher) Fetch(ctx context.Context, desc ocispec.Descriptor) (io.R
}) })
} }
func (r dockerFetcher) open(ctx context.Context, req *request, mediatype string, offset int64) (io.ReadCloser, error) { func (r dockerFetcher) open(ctx context.Context, req *request, mediatype string, offset int64) (_ io.ReadCloser, retErr error) {
req.header.Set("Accept", strings.Join([]string{mediatype, `*/*`}, ", ")) req.header.Set("Accept", strings.Join([]string{mediatype, `*/*`}, ", "))
if offset > 0 { if offset > 0 {
@ -162,13 +162,17 @@ func (r dockerFetcher) open(ctx context.Context, req *request, mediatype string,
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer func() {
if retErr != nil {
resp.Body.Close()
}
}()
if resp.StatusCode > 299 { if resp.StatusCode > 299 {
// TODO(stevvooe): When doing a offset specific request, we should // TODO(stevvooe): When doing a offset specific request, we should
// really distinguish between a 206 and a 200. In the case of 200, we // really distinguish between a 206 and a 200. In the case of 200, we
// can discard the bytes, hiding the seek behavior from the // can discard the bytes, hiding the seek behavior from the
// implementation. // implementation.
defer resp.Body.Close()
if resp.StatusCode == http.StatusNotFound { if resp.StatusCode == http.StatusNotFound {
return nil, errors.Wrapf(errdefs.ErrNotFound, "content at %v not found", req.String()) return nil, errors.Wrapf(errdefs.ErrNotFound, "content at %v not found", req.String())