From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Nov 2021 23:41:49 +0000 (-0800)
Subject: Merge branch 'tb/plug-pack-bitmap-leaks'
X-Git-Tag: v2.35.0-rc0~129
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=49767c3d9f80c916c175adfc745e0823487d9d08;p=thirdparty%2Fgit.git

Merge branch 'tb/plug-pack-bitmap-leaks'

Leakfix.

* tb/plug-pack-bitmap-leaks:
  pack-bitmap.c: more aggressively free in free_bitmap_index()
  pack-bitmap.c: don't leak type-level bitmaps
  midx.c: write MIDX filenames to strbuf
  builtin/multi-pack-index.c: don't leak concatenated options
  builtin/repack.c: avoid leaking child arguments
  builtin/pack-objects.c: don't leak memory via arguments
  t/helper/test-read-midx.c: free MIDX within read_midx_file()
  midx.c: don't leak MIDX from verify_midx_file
  midx.c: clean up chunkfile after reading the MIDX
---

49767c3d9f80c916c175adfc745e0823487d9d08
diff --cc midx.c
index 8433086ac1,696a938e72..837b46b2af
--- a/midx.c
+++ b/midx.c
@@@ -1141,10 -1129,13 +1144,10 @@@ static int write_midx_internal(const ch
  	int result = 0;
  	struct chunkfile *cf;
  
- 	midx_name = get_midx_filename(object_dir);
- 	if (safe_create_leading_directories(midx_name))
 -	/* Ensure the given object_dir is local, or a known alternate. */
 -	find_odb(the_repository, object_dir);
 -
+ 	get_midx_filename(&midx_name, object_dir);
+ 	if (safe_create_leading_directories(midx_name.buf))
  		die_errno(_("unable to create leading directories of %s"),
- 			  midx_name);
+ 			  midx_name.buf);
  
  	if (!packs_to_include) {
  		/*