From: Taylor Blau <me@ttaylorr.com>
Date: Fri, 26 Feb 2021 16:31:02 +0000 (-0500)
Subject: pack-revindex.c: don't close unopened file descriptors
X-Git-Tag: v2.31.0~2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66f52fa26b4facbf79e3f74d8bc95f8ac8535c50;p=thirdparty%2Fgit.git

pack-revindex.c: don't close unopened file descriptors

When opening a reverse index, load_revindex_from_disk() jumps to the
'cleanup' label in case something goes wrong: the reverse index had the
wrong size, an unrecognized version, or similar.

It also jumps to this label when the reverse index couldn't be opened in
the first place, which will cause an error with the unguarded close()
call in the label.

Guard this call with "if (fd >= 0)" to make sure that we have a valid
file descriptor to close before attempting to close it.

Reported-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/pack-revindex.c b/pack-revindex.c
index 83fe4de773..4262530449 100644
--- a/pack-revindex.c
+++ b/pack-revindex.c
@@ -253,7 +253,8 @@ cleanup:
 		*data_p = (const uint32_t *)data;
 	}
 
-	close(fd);
+	if (fd >= 0)
+		close(fd);
 	return ret;
 }