Merge pull request containerd#5717 from thaJeztah/1.4_backport_docker_push_close_body

estesp · web-flow · commit e6d4da0b48d1 · 2021-07-12T18:01:27.000-04:00
[release/1.4 backport] Fix missing Body.Close() calls on push to docker remote
diff --git a/remotes/docker/pusher.go b/remotes/docker/pusher.go
@@ -155,6 +155,7 @@ func (p dockerPusher) Push(ctx context.Context, desc ocispec.Descriptor) (conten
 				return nil, err
 			}
 		}
+		defer resp.Body.Close()
 
 		switch resp.StatusCode {
 		case http.StatusOK, http.StatusAccepted, http.StatusNoContent:
@@ -338,6 +339,7 @@ func (pw *pushWriter) Commit(ctx context.Context, size int64, expected digest.Di
 	if resp == nil {
 		return errors.New("no response")
 	}
+	defer resp.Body.Close()
 
 	// 201 is specified return status, some registries return
 	// 200, 202 or 204.

Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,7 @@ func (p dockerPusher) Push(ctx context.Context, desc ocispec.Descriptor) (conten`
`155`	`155`	`return nil, err`
`156`	`156`	`}`
`157`	`157`	`}`
	`158`	`+ defer resp.Body.Close()`
`158`	`159`
`159`	`160`	`switch resp.StatusCode {`
`160`	`161`	`case http.StatusOK, http.StatusAccepted, http.StatusNoContent:`
`@@ -338,6 +339,7 @@ func (pw *pushWriter) Commit(ctx context.Context, size int64, expected digest.Di`
`338`	`339`	`if resp == nil {`
`339`	`340`	`return errors.New("no response")`
`340`	`341`	`}`
	`342`	`+ defer resp.Body.Close()`
`341`	`343`
`342`	`344`	`// 201 is specified return status, some registries return`
`343`	`345`	`// 200, 202 or 204.`