]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'tb/plug-pack-bitmap-leaks'
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Nov 2021 23:41:49 +0000 (15:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Nov 2021 23:41:49 +0000 (15:41 -0800)
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

1  2 
midx.c

diff --cc midx.c
index 8433086ac13c91a5c00fd4c97ef72341b2c06e3a,696a938e720195afbde57064b7b0b5aa1f4fa771..837b46b2af5fd766b981964ca27be427225b7591
--- 1/midx.c
--- 2/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) {
                /*