fix treewide: register more deferes immediately

stevebeattie · egibs · stevebeattie · commit cca06d654285 · 2026-02-04T18:16:15.000-08:00
Signed-off-by: Steve Beattie &lt;steve.beattie@chainguard.dev&gt;
Co-authored-by: egibs &lt;20933572+egibs@users.noreply.github.com&gt;
diff --git a/pkg/action/diff.go b/pkg/action/diff.go
@@ -239,6 +239,12 @@ func Diff(ctx context.Context, c malcontent.Config, _ *clog.Logger) (*malcontent
 	}
 
 	srcCh, destCh := make(chan ScanResult, 1), make(chan ScanResult, 1)
+
+	defer func() {
+		close(srcCh)
+		close(destCh)
+	}()
+
 	srcIsArchive, destIsArchive := programkind.IsSupportedArchive(ctx, srcPath), programkind.IsSupportedArchive(ctx, destPath)
 	srcResult, destResult := ScanResult{}, ScanResult{}
 
@@ -379,11 +385,6 @@ func Diff(ctx context.Context, c malcontent.Config, _ *clog.Logger) (*malcontent
 		}
 	}
 
-	defer func() {
-		close(srcCh)
-		close(destCh)
-	}()
-
 	return &malcontent.Report{Diff: d}, nil
 }
 
diff --git a/pkg/archive/bz2.go b/pkg/archive/bz2.go
@@ -33,11 +33,14 @@ func ExtractBz2(ctx context.Context, d, f string) error {
 	}
 
 	buf := archivePool.Get(file.ExtractBuffer) //nolint:nilaway // the buffer pool is created in archive.go
+	defer archivePool.Put(buf)
 
 	tf, err := os.Open(f)
 	if err != nil {
 		return fmt.Errorf("failed to open file: %w", err)
 	}
+	defer tf.Close()
+
 	// Set offset to the file origin regardless of type
 	_, err = tf.Seek(0, io.SeekStart)
 	if err != nil {
@@ -61,12 +64,7 @@ func ExtractBz2(ctx context.Context, d, f string) error {
 	if err != nil {
 		return fmt.Errorf("failed to create file: %w", err)
 	}
-
-	defer func() {
-		archivePool.Put(buf)
-		tf.Close()
-		out.Close()
-	}()
+	defer out.Close()
 
 	var written int64
 	for {
diff --git a/pkg/archive/deb.go b/pkg/archive/deb.go
@@ -33,16 +33,13 @@ func ExtractDeb(ctx context.Context, d, f string) error {
 	if err != nil {
 		return fmt.Errorf("failed to open file: %w", err)
 	}
+	defer fd.Close()
 
 	df, err := deb.Load(fd, f)
 	if err != nil {
 		return fmt.Errorf("failed to load file: %w", err)
 	}
-
-	defer func() {
-		fd.Close()
-		df.Close()
-	}()
+	defer df.Close()
 
 	for {
 		header, err := df.Data.Next()
diff --git a/pkg/archive/gzip.go b/pkg/archive/gzip.go
@@ -55,11 +55,13 @@ func ExtractGzip(ctx context.Context, d string, f string) error {
 	}
 
 	buf := archivePool.Get(file.ExtractBuffer) //nolint:nilaway // the buffer pool is created in archive.go
+	defer archivePool.Put(buf)
 
 	gf, err := os.Open(f)
 	if err != nil {
 		return fmt.Errorf("failed to open file: %w", err)
 	}
+	defer gf.Close()
 
 	base := filepath.Base(f)
 	target := filepath.Join(d, base[:len(base)-len(filepath.Ext(base))])
@@ -71,18 +73,13 @@ func ExtractGzip(ctx context.Context, d string, f string) error {
 	if err != nil {
 		return fmt.Errorf("failed to create gzip reader: %w", err)
 	}
+	defer gr.Close()
 
 	out, err := os.Create(target)
 	if err != nil {
 		return fmt.Errorf("failed to create extracted file: %w", err)
 	}
-
-	defer func() {
-		archivePool.Put(buf)
-		gf.Close()
-		gr.Close()
-		out.Close()
-	}()
+	defer out.Close()
 
 	var written int64
 	for {
diff --git a/pkg/archive/rpm.go b/pkg/archive/rpm.go
@@ -147,6 +147,7 @@ func ExtractRPM(ctx context.Context, d, f string) error {
 		if err != nil {
 			return fmt.Errorf("failed to create file: %w", err)
 		}
+		defer out.Close()
 
 		var written int64
 		for {
@@ -173,10 +174,6 @@ func ExtractRPM(ctx context.Context, d, f string) error {
 				return fmt.Errorf("failed to read file contents: %w", err)
 			}
 		}
-
-		if err := out.Close(); err != nil {
-			return fmt.Errorf("failed to close file: %w", err)
-		}
 	}
 
 	return nil
diff --git a/pkg/archive/tar.go b/pkg/archive/tar.go
@@ -50,17 +50,14 @@ func ExtractTar(ctx context.Context, d string, f string) error {
 	}
 
 	buf := tarPool.Get(file.ExtractBuffer) //nolint:nilaway // the buffer pool is created in archive.go
+	defer tarPool.Put(buf)
 
 	filename := filepath.Base(f)
 	tf, err := os.Open(f)
 	if err != nil {
 		return fmt.Errorf("failed to open file: %w", err)
 	}
-
-	defer func() {
-		tarPool.Put(buf)
-		tf.Close()
-	}()
+	defer tf.Close()
 
 	isTGZ := strings.Contains(f, ".tar.gz") || strings.Contains(f, ".tgz")
 	var isGzip bool
@@ -145,6 +142,8 @@ func ExtractTar(ctx context.Context, d string, f string) error {
 		if err != nil {
 			return fmt.Errorf("failed to create file: %w", err)
 		}
+		defer out.Close()
+
 		var written int64
 		for {
 			if written > 0 && written%file.ExtractBuffer == 0 && ctx.Err() != nil {
diff --git a/pkg/archive/zip.go b/pkg/archive/zip.go
@@ -156,6 +156,7 @@ func extractFile(ctx context.Context, zf *zip.File, destDir string, logger *clog
 	}
 
 	buf := zipPool.Get(file.ZipBuffer) //nolint:nilaway // the buffer pool is created in archive.go
+	defer zipPool.Put(buf)
 
 	if err := os.MkdirAll(filepath.Dir(target), 0o700); err != nil {
 		return fmt.Errorf("failed to create directory structure: %w", err)
@@ -165,17 +166,13 @@ func extractFile(ctx context.Context, zf *zip.File, destDir string, logger *clog
 	if err != nil {
 		return fmt.Errorf("failed to open archived file: %w", err)
 	}
+	defer src.Close()
 
 	dst, err := os.OpenFile(target, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o600)
 	if err != nil {
 		return fmt.Errorf("failed to create destination file: %w", err)
 	}
-
-	defer func() {
-		src.Close()
-		dst.Close()
-		zipPool.Put(buf)
-	}()
+	defer dst.Close()
 
 	var written int64
 	for {
diff --git a/pkg/archive/zlib.go b/pkg/archive/zlib.go
@@ -32,11 +32,13 @@ func ExtractZlib(ctx context.Context, d string, f string) error {
 	}
 
 	buf := archivePool.Get(file.ExtractBuffer) //nolint:nilaway // the buffer pool is created in archive.go
+	defer archivePool.Put(buf)
 
 	zf, err := os.Open(f)
 	if err != nil {
 		return fmt.Errorf("failed to open file: %w", err)
 	}
+	defer zf.Close()
 
 	base := filepath.Base(f)
 	target := filepath.Join(d, base[:len(base)-len(filepath.Ext(base))])
@@ -49,18 +51,13 @@ func ExtractZlib(ctx context.Context, d string, f string) error {
 	if err != nil {
 		return fmt.Errorf("failed to create zlib reader: %w", err)
 	}
+	defer zr.Close()
 
 	out, err := os.OpenFile(target, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o600)
 	if err != nil {
 		return fmt.Errorf("failed to create extracted file: %w", err)
 	}
-
-	defer func() {
-		archivePool.Put(buf)
-		zf.Close()
-		zr.Close()
-		out.Close()
-	}()
+	defer out.Close()
 
 	var written int64
 	for {
diff --git a/pkg/archive/zlib.go.rej b/pkg/archive/zlib.go.rej
@@ -0,0 +1,37 @@
+--- pkg/archive/zlib.go
++++ pkg/archive/zlib.go
+@@ -35,11 +35,13 @@ func ExtractZlib(ctx context.Context, d string, f string) error {
+ 	}
+ 
+ 	buf := archivePool.Get(file.ExtractBuffer) //nolint:nilaway // the buffer pool is created in archive.go
++	defer archivePool.Put(buf)
+ 
+ 	zf, err := os.Open(f)
+ 	if err != nil {
+ 		return fmt.Errorf("failed to open file: %w", err)
+ 	}
++	defer zf.Close()
+ 
+ 	base := filepath.Base(f)
+ 	target := filepath.Join(d, base[:len(base)-len(filepath.Ext(base))])
+@@ -52,18 +54,13 @@ func ExtractZlib(ctx context.Context, d string, f string) error {
+ 	if err != nil {
+ 		return fmt.Errorf("failed to create zlib reader: %w", err)
+ 	}
++	defer zr.Close()
+ 
+ 	out, err := os.OpenFile(target, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o600)
+ 	if err != nil {
+ 		return fmt.Errorf("failed to create extracted file: %w", err)
+ 	}
+-
+-	defer func() {
+-		archivePool.Put(buf)
+-		zf.Close()
+-		zr.Close()
+-		out.Close()
+-	}()
++	defer out.Close()
+ 
+ 	var written int64
+ 	for {
diff --git a/pkg/archive/zstd.go b/pkg/archive/zstd.go
@@ -32,6 +32,7 @@ func ExtractZstd(ctx context.Context, d string, f string) error {
 	}
 
 	buf := archivePool.Get(file.ExtractBuffer) //nolint:nilaway // the buffer pool is created in archive.go
+	defer archivePool.Put(buf)
 
 	uncompressed := strings.TrimSuffix(filepath.Base(f), ".zstd")
 	uncompressed = strings.TrimSuffix(uncompressed, ".zst")
@@ -49,23 +50,19 @@ func ExtractZstd(ctx context.Context, d string, f string) error {
 	if err != nil {
 		return fmt.Errorf("failed to create decompressed zstd file: %w", err)
 	}
+	defer out.Close()
 
 	zstdFile, err := os.Open(f)
 	if err != nil {
 		return fmt.Errorf("failed to open zstd file: %w", err)
 	}
+	defer zstdFile.Close()
 
 	zr, err := zstd.NewReader(zstdFile)
 	if err != nil {
 		return fmt.Errorf("failed to open zstd file %s: %w", f, err)
 	}
-
-	defer func() {
-		archivePool.Put(buf)
-		zstdFile.Close()
-		zr.Close()
-		out.Close()
-	}()
+	defer zr.Close()
 
 	var written int64
 	for {

Original file line number	Diff line number	Diff line change
`@@ -239,6 +239,12 @@ func Diff(ctx context.Context, c malcontent.Config, _ clog.Logger) (malcontent`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`srcCh, destCh := make(chan ScanResult, 1), make(chan ScanResult, 1)`
	`242`	`+`
	`243`	`+ defer func() {`
	`244`	`+ close(srcCh)`
	`245`	`+ close(destCh)`
	`246`	`+ }()`
	`247`	`+`
`242`	`248`	`srcIsArchive, destIsArchive := programkind.IsSupportedArchive(ctx, srcPath), programkind.IsSupportedArchive(ctx, destPath)`
`243`	`249`	`srcResult, destResult := ScanResult{}, ScanResult{}`
`244`	`250`
`@@ -379,11 +385,6 @@ func Diff(ctx context.Context, c malcontent.Config, _ clog.Logger) (malcontent`
`379`	`385`	`}`
`380`	`386`	`}`
`381`	`387`
`382`		`- defer func() {`
`383`		`- close(srcCh)`
`384`		`- close(destCh)`
`385`		`- }()`
`386`		`-`
`387`	`388`	`return &malcontent.Report{Diff: d}, nil`
`388`	`389`	`}`
`389`	`390`
Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,7 @@ func ExtractRPM(ctx context.Context, d, f string) error {`
`147`	`147`	`if err != nil {`
`148`	`148`	`return fmt.Errorf("failed to create file: %w", err)`
`149`	`149`	`}`
	`150`	`+ defer out.Close()`
`150`	`151`
`151`	`152`	`var written int64`
`152`	`153`	`for {`
`@@ -173,10 +174,6 @@ func ExtractRPM(ctx context.Context, d, f string) error {`
`173`	`174`	`return fmt.Errorf("failed to read file contents: %w", err)`
`174`	`175`	`}`
`175`	`176`	`}`
`176`		`-`
`177`		`- if err := out.Close(); err != nil {`
`178`		`- return fmt.Errorf("failed to close file: %w", err)`
`179`		`- }`
`180`	`177`	`}`
`181`	`178`
`182`	`179`	`return nil`