Browse Source

test-tool bloom: fix memory leaks

Fix memory leaks introduced with these tests in f1294eaf7f (bloom.c:
introduce core Bloom filter constructs, 2020-03-30), as a result we
can mark almost the entirety of t0095-bloom.sh as passing with
SANITIZE=leak using "TEST_PASSES_SANITIZE_LEAK=true", there's still an
unrelated memory leak in "git commit" in one of the tests, let's skip
that one under SANITIZE_LEAK for now.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Ævar Arnfjörð Bjarmason 3 years ago committed by Junio C Hamano
parent
commit
9794633b4e
  1. 2
      t/helper/test-bloom.c
  2. 2
      t/t0095-bloom.sh

2
t/helper/test-bloom.c

@ -16,6 +16,7 @@ static void add_string_to_filter(const char *data, struct bloom_filter *filter) @@ -16,6 +16,7 @@ static void add_string_to_filter(const char *data, struct bloom_filter *filter)
}
printf("\n");
add_key_to_filter(&key, filter, &settings);
clear_bloom_key(&key);
}

static void print_bloom_filter(struct bloom_filter *filter) {
@ -80,6 +81,7 @@ int cmd__bloom(int argc, const char **argv) @@ -80,6 +81,7 @@ int cmd__bloom(int argc, const char **argv)
}

print_bloom_filter(&filter);
free(filter.data);
}

if (!strcmp(argv[1], "get_filter_for_commit")) {

2
t/t0095-bloom.sh

@ -67,7 +67,7 @@ test_expect_success 'compute bloom key for test string 2' ' @@ -67,7 +67,7 @@ test_expect_success 'compute bloom key for test string 2' '
test_cmp expect actual
'

test_expect_success 'get bloom filters for commit with no changes' '
test_expect_success !SANITIZE_LEAK 'get bloom filters for commit with no changes' '
git init &&
git commit --allow-empty -m "c0" &&
cat >expect <<-\EOF &&

Loading…
Cancel
Save