From c41f7894d7772a8c76ea17493e34aa7e2e51540a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Wed, 15 Nov 2023 15:34:02 +0200
Subject: [PATCH] fix: temporary file cleanup

Improve Close error handling, clean up also if we exec successfully.
---
 wrun.go | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/wrun.go b/wrun.go
index 796d277..cfc8a8e 100644
--- a/wrun.go
+++ b/wrun.go
@@ -298,14 +298,15 @@ Environment variables:
 		rc = 1
 		return
 	}
-	defer func() {
+	cleanUpTempFile := func() {
+		if closeErr := tmpf.Close(); err != nil && !errors.Is(closeErr, os.ErrClosed) {
+			warnOut("close tempfile: %v", closeErr)
+		}
 		if rmErr := os.Remove(tmpf.Name()); rmErr != nil && !errors.Is(rmErr, os.ErrNotExist) {
 			warnOut("remove tempfile: %v", rmErr)
 		}
-	}()
-	defer func() {
-		_ = tmpf.Close() // ignore error, we may have eagerly closed it already // TODO don't close multiple times, results are undefined
-	}()
+	}
+	defer cleanUpTempFile() // Note: does not happen if we exec successfully
 
 	// Download
 
@@ -397,6 +398,7 @@ Environment variables:
 
 	// Execute
 
+	cleanUpTempFile() // Note: deferred cleanup does not happen if we exec successfully
 	err = exec(exePath)
 	errorOut("exec: %v", err)
 	rc = 1