From: Taylor Blau <me@ttaylorr.com>
Date: Tue, 26 Oct 2021 21:01:11 +0000 (-0400)
Subject: t/helper/test-read-midx.c: free MIDX within read_midx_file()
X-Git-Tag: v2.35.0-rc0~129^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f4c3508c06e154485ea9ce82be00e1e3df57f54;p=thirdparty%2Fgit.git

t/helper/test-read-midx.c: free MIDX within read_midx_file()

When calling `read_midx_file()` to show information about a MIDX or list
the objects contained within it we fail to call `close_midx()`, leaking
the memory allocated to store that MIDX.

Fix this by calling `close_midx()` before exiting the function. We can
drop the "early" return when `show_objects` is non-zero, since the next
instruction is also a return.

(We could just as easily put a `cleanup` label here as with previous
patches. But the only other time we terminate the function early is
when we fail to load a MIDX in the first place. `close_midx()` does
handle a NULL argument, but the extra complexity is likely not
warranted).

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/helper/test-read-midx.c b/t/helper/test-read-midx.c
index 9d6fa7a377..27072ba94d 100644
--- a/t/helper/test-read-midx.c
+++ b/t/helper/test-read-midx.c
@@ -55,9 +55,10 @@ static int read_midx_file(const char *object_dir, int show_objects)
 			printf("%s %"PRIu64"\t%s\n",
 			       oid_to_hex(&oid), e.offset, e.p->pack_name);
 		}
-		return 0;
 	}
 
+	close_midx(m);
+
 	return 0;
 }