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

wzshiming · thaJeztah · commit 7b17268fd180 · 2021-07-21T17:06:28.000+02:00
Signed-off-by: Shiming Zhang <wzshiming@foxmail.com> (cherry picked from commit 53ec1ab) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/remotes/docker/pusher.go b/remotes/docker/pusher.go
@@ -143,13 +143,16 @@ func (p dockerPusher) push(ctx context.Context, desc ocispec.Descriptor, ref str
 						// TODO: Set updated time?
 					},
 				})
+				resp.Body.Close()
 				return nil, errors.Wrapf(errdefs.ErrAlreadyExists, "content %v on remote", desc.Digest)
 			}
 		} else if resp.StatusCode != http.StatusNotFound {
 			err := remoteserrors.NewUnexpectedStatusErr(resp)
 			log.G(ctx).WithField("resp", resp).WithField("body", string(err.(remoteserrors.ErrUnexpectedStatus).Body)).Debug("unexpected response")
+			resp.Body.Close()
 			return nil, err
 		}
+		resp.Body.Close()
 	}
 
 	if isManifest {

Original file line number	Diff line number	Diff line change
`@@ -143,13 +143,16 @@ func (p dockerPusher) push(ctx context.Context, desc ocispec.Descriptor, ref str`
`143`	`143`	`// TODO: Set updated time?`
`144`	`144`	`},`
`145`	`145`	`})`
	`146`	`+ resp.Body.Close()`
`146`	`147`	`return nil, errors.Wrapf(errdefs.ErrAlreadyExists, "content %v on remote", desc.Digest)`
`147`	`148`	`}`
`148`	`149`	`} else if resp.StatusCode != http.StatusNotFound {`
`149`	`150`	`err := remoteserrors.NewUnexpectedStatusErr(resp)`
`150`	`151`	`log.G(ctx).WithField("resp", resp).WithField("body", string(err.(remoteserrors.ErrUnexpectedStatus).Body)).Debug("unexpected response")`
	`152`	`+ resp.Body.Close()`
`151`	`153`	`return nil, err`
`152`	`154`	`}`
	`155`	`+ resp.Body.Close()`
`153`	`156`	`}`
`154`	`157`
`155`	`158`	`if isManifest {`