[PATCH 04/20] verify_signed_buffer: prefer close_tempfile() to close()

From: Jeff King <peff@peff.net>
Date: Sep 5, 2017, 12:14 UTC
Message-ID: <20170905121422.sf467ufqkone3xn7@sigill.intra.peff.net>
In-Reply-To: <20170905121353.62zg3mtextmq5zrs@sigill.intra.peff.net>

We do a manual close() on the descriptor provided to us by mks_tempfile. But this runs contrary to the advice in tempfile.h, which notes that you should always use close_tempfile(). Otherwise the descriptor may be reused without the tempfile object knowing it, and the later call to delete_tempfile() could close a random descriptor.

Signed-off-by: Jeff King <peff@peff.net>
---
 gpg-interface.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gpg-interface.c b/gpg-interface.c
index d936f3a32f..455b6c04b4 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -215,7 +215,7 @@ int verify_signed_buffer(const char *payload, size_t payload_size,
 		delete_tempfile(&temp);
 		return -1;
 	}
-	close(fd);
+	close_tempfile(&temp);
 
 	argv_array_pushl(&gpg.args,
 			 gpg_program,

-- 
2.14.1.721.gc5bc1565f1