fix treewide: register more defers immediately (#1355)

v2: revert doing a deferred close() in a loop in rpm.go

Signed-off-by: Steve Beattie <steve.beattie@chainguard.dev>
Co-authored-by: egibs <20933572+egibs@users.noreply.github.com>

Author: stevebeattie

pkg/action/diff.go

@@ -233,6 +233,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{}
 
@@ -373,11 +379,6 @@ func Diff(ctx context.Context, c malcontent.Config, _ *clog.Logger) (*malcontent
 		}
 	}
 
-	defer func() {
-		close(srcCh)
-		close(destCh)
-	}()
-
 	return &malcontent.Report{Diff: d}, nil
 }
 

pkg/archive/bz2.go

@@ -36,11 +36,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 {
@@ -64,12 +67,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 {

pkg/archive/deb.go

@@ -30,16 +30,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()

pkg/archive/gzip.go

@@ -58,11 +58,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))])
@@ -74,18 +76,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 {

pkg/archive/tar.go

@@ -43,17 +43,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
@@ -138,6 +135,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 {

pkg/archive/zip.go

@@ -151,6 +151,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)
@@ -160,17 +161,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 {

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 {

pkg/archive/zstd.go

@@ -35,6 +35,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")
@@ -52,23 +53,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 {