Fix content.ReaderAt close

wzshiming · wzshiming · commit b890f056e87d · 2021-05-08T12:39:09.000+08:00
Signed-off-by: Shiming Zhang &lt;wzshiming@foxmail.com&gt;
diff --git a/cmd/ctr/commands/snapshots/snapshots.go b/cmd/ctr/commands/snapshots/snapshots.go
@@ -164,6 +164,7 @@ var diffCommand = cli.Command{
 		if err != nil {
 			return err
 		}
+		defer ra.Close()
 		_, err = io.Copy(os.Stdout, content.NewReader(ra))
 
 		return err
diff --git a/content/testsuite/testsuite.go b/content/testsuite/testsuite.go
@@ -780,6 +780,7 @@ func checkSmallBlob(ctx context.Context, t *testing.T, store content.Store) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer ra.Close()
 	r := io.NewSectionReader(ra, 0, readSize)
 	b, err := ioutil.ReadAll(r)
 	if err != nil {
diff --git a/images/archive/importer.go b/images/archive/importer.go
@@ -281,6 +281,7 @@ func resolveLayers(ctx context.Context, store content.Store, layerFiles []string
 		}
 		s, err := compression.DecompressStream(content.NewReader(ra))
 		if err != nil {
+			ra.Close()
 			return nil, errors.Wrapf(err, "failed to detect compression for %q", layerFiles[i])
 		}
 		if s.GetCompression() == compression.Uncompressed {
@@ -292,6 +293,7 @@ func resolveLayers(ctx context.Context, store content.Store, layerFiles []string
 				layers[i], err = compressBlob(ctx, store, s, ref, content.WithLabels(labels))
 				if err != nil {
 					s.Close()
+					ra.Close()
 					return nil, err
 				}
 				layers[i].MediaType = images.MediaTypeDockerSchema2LayerGzip
@@ -302,7 +304,7 @@ func resolveLayers(ctx context.Context, store content.Store, layerFiles []string
 			layers[i].MediaType = images.MediaTypeDockerSchema2LayerGzip
 		}
 		s.Close()
-
+		ra.Close()
 	}
 	return layers, nil
 }
diff --git a/install.go b/install.go
@@ -66,6 +66,7 @@ func (c *Client) Install(ctx context.Context, image Image, opts ...InstallOpts)
 		cr := content.NewReader(ra)
 		r, err := compression.DecompressStream(cr)
 		if err != nil {
+			ra.Close()
 			return err
 		}
 		if _, err := archive.Apply(ctx, path, r, archive.WithFilter(func(hdr *tar.Header) (bool, error) {
@@ -87,9 +88,11 @@ func (c *Client) Install(ctx context.Context, image Image, opts ...InstallOpts)
 			return result, nil
 		})); err != nil {
 			r.Close()
+			ra.Close()
 			return err
 		}
 		r.Close()
+		ra.Close()
 	}
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,7 @@ var diffCommand = cli.Command{`
`164`	`164`	`if err != nil {`
`165`	`165`	`return err`
`166`	`166`	`}`
	`167`	`+ defer ra.Close()`
`167`	`168`	`_, err = io.Copy(os.Stdout, content.NewReader(ra))`
`168`	`169`
`169`	`170`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -780,6 +780,7 @@ func checkSmallBlob(ctx context.Context, t *testing.T, store content.Store) {`
`780`	`780`	`if err != nil {`
`781`	`781`	`t.Fatal(err)`
`782`	`782`	`}`
	`783`	`+ defer ra.Close()`
`783`	`784`	`r := io.NewSectionReader(ra, 0, readSize)`
`784`	`785`	`b, err := ioutil.ReadAll(r)`
`785`	`786`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -281,6 +281,7 @@ func resolveLayers(ctx context.Context, store content.Store, layerFiles []string`
`281`	`281`	`}`
`282`	`282`	`s, err := compression.DecompressStream(content.NewReader(ra))`
`283`	`283`	`if err != nil {`
	`284`	`+ ra.Close()`
`284`	`285`	`return nil, errors.Wrapf(err, "failed to detect compression for %q", layerFiles[i])`
`285`	`286`	`}`
`286`	`287`	`if s.GetCompression() == compression.Uncompressed {`
`@@ -292,6 +293,7 @@ func resolveLayers(ctx context.Context, store content.Store, layerFiles []string`
`292`	`293`	`layers[i], err = compressBlob(ctx, store, s, ref, content.WithLabels(labels))`
`293`	`294`	`if err != nil {`
`294`	`295`	`s.Close()`
	`296`	`+ ra.Close()`
`295`	`297`	`return nil, err`
`296`	`298`	`}`
`297`	`299`	`layers[i].MediaType = images.MediaTypeDockerSchema2LayerGzip`
`@@ -302,7 +304,7 @@ func resolveLayers(ctx context.Context, store content.Store, layerFiles []string`
`302`	`304`	`layers[i].MediaType = images.MediaTypeDockerSchema2LayerGzip`
`303`	`305`	`}`
`304`	`306`	`s.Close()`
`305`		`-`
	`307`	`+ ra.Close()`
`306`	`308`	`}`
`307`	`309`	`return layers, nil`
`308`	`310`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ func (c *Client) Install(ctx context.Context, image Image, opts ...InstallOpts)`
`66`	`66`	`cr := content.NewReader(ra)`
`67`	`67`	`r, err := compression.DecompressStream(cr)`
`68`	`68`	`if err != nil {`
	`69`	`+ ra.Close()`
`69`	`70`	`return err`
`70`	`71`	`}`
`71`	`72`	`if _, err := archive.Apply(ctx, path, r, archive.WithFilter(func(hdr *tar.Header) (bool, error) {`
`@@ -87,9 +88,11 @@ func (c *Client) Install(ctx context.Context, image Image, opts ...InstallOpts)`
`87`	`88`	`return result, nil`
`88`	`89`	`})); err != nil {`
`89`	`90`	`r.Close()`
	`91`	`+ ra.Close()`
`90`	`92`	`return err`
`91`	`93`	`}`
`92`	`94`	`r.Close()`
	`95`	`+ ra.Close()`
`93`	`96`	`}`
`94`	`97`	`return nil`
`95`	`98`	`}`