mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t/helper: fix leaking multi-pack-indices in "read-midx"

Browse Source 
Several of the subcommands of `test-helper read-midx` do not close the
MIDX that they have opened, leading to memory leaks. Fix those.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2024-08-22 11:17:38 +02:00
committed by Junio C Hamano
parent bda97cb119
commit fb24460e1d
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
t/helper/test-read-midx.c
View File

@ -86,6 +86,8 @@ static int read_midx_checksum(const char *object_dir)
if (!m) if (!m)
return 1; return 1;
printf("%s\n", hash_to_hex(get_midx_checksum(m))); printf("%s\n", hash_to_hex(get_midx_checksum(m)));
close_midx(m);
return 0; return 0;
} }
@ -102,10 +104,12 @@ static int read_midx_preferred_pack(const char *object_dir)
if (midx_preferred_pack(midx, &preferred_pack) < 0) { if (midx_preferred_pack(midx, &preferred_pack) < 0) {
warning(_("could not determine MIDX preferred pack")); warning(_("could not determine MIDX preferred pack"));
close_midx(midx);
return 1; return 1;
} }
printf("%s\n", midx->pack_names[preferred_pack]); printf("%s\n", midx->pack_names[preferred_pack]);
close_midx(midx);
return 0; return 0;
} }
@ -122,8 +126,10 @@ static int read_midx_bitmapped_packs(const char *object_dir)
return 1; return 1;
for (i = 0; i < midx->num_packs + midx->num_packs_in_base; i++) { for (i = 0; i < midx->num_packs + midx->num_packs_in_base; i++) {
if (nth_bitmapped_pack(the_repository, midx, &pack, i) < 0) if (nth_bitmapped_pack(the_repository, midx, &pack, i) < 0) {
close_midx(midx);
return 1; return 1;
}
printf("%s\n", pack_basename(pack.p)); printf("%s\n", pack_basename(pack.p));
printf(" bitmap_pos: %"PRIuMAX"\n", (uintmax_t)pack.bitmap_pos); printf(" bitmap_pos: %"PRIuMAX"\n", (uintmax_t)pack.bitmap_pos);

2
t/t5319-multi-pack-index.sh
View File

@ -1,6 +1,8 @@
#!/bin/sh #!/bin/sh
test_description='multi-pack-indexes' test_description='multi-pack-indexes'
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh . ./test-lib.sh
. "$TEST_DIRECTORY"/lib-chunk.sh . "$TEST_DIRECTORY"/lib-chunk.sh
. "$TEST_DIRECTORY"/lib-midx.sh . "$TEST_DIRECTORY"/lib-midx.sh

1
t/t7704-repack-cruft.sh
View File

@ -2,6 +2,7 @@
test_description='git repack works correctly' test_description='git repack works correctly'
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh . ./test-lib.sh
objdir=.git/objects objdir=.git/objects