do not close the reader

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
appc · Jul 7, 2016 · 505cc4f · 505cc4f
1 parent da56c93
commit 505cc4f
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/lib/internal/backend/repository/repository2.go b/lib/internal/backend/repository/repository2.go
@@ -475,7 +475,11 @@ func validateV1ID(id string) error {
 }
 
 func (rb *RepositoryBackend) getLayerV2(layerID string, dockerURL *types.ParsedDockerURL, tmpDir string, copier *progressutil.CopyProgressPrinter) (*os.File, io.ReadCloser, error) {
-	url := rb.schema + path.Join(dockerURL.IndexURL, "v2", dockerURL.ImageName, "blobs", layerID)
+	var (
+		err error
+		res *http.Response
+		url = rb.schema + path.Join(dockerURL.IndexURL, "v2", dockerURL.ImageName, "blobs", layerID)
+	)
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
 		return nil, nil, err
@@ -488,23 +492,32 @@ func (rb *RepositoryBackend) getLayerV2(layerID string, dockerURL *types.ParsedD
 		typesV2.MediaTypeOCIRootFS,
 	}
 
-	res, err := rb.makeRequest(req, dockerURL.ImageName, accepting)
+	res, err = rb.makeRequest(req, dockerURL.ImageName, accepting)
 	if err != nil {
 		return nil, nil, err
 	}
 
+	defer func() {
+		if err != nil {
+			if res != nil {
+				res.Body.Close()
+			}
+		}
+	}()
+
 	if res.StatusCode == http.StatusTemporaryRedirect || res.StatusCode == http.StatusFound {
 		location := res.Header.Get("Location")
 		if location != "" {
 			req, err = http.NewRequest("GET", location, nil)
 			if err != nil {
 				return nil, nil, err
 			}
+			res.Body.Close()
+			res = nil
 			res, err = rb.makeRequest(req, dockerURL.ImageName, accepting)
 			if err != nil {
 				return nil, nil, err
 			}
-			defer res.Body.Close()
 		}
 	}