summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2022-07-01 10:37:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-07-01 20:38:50 (GMT)
commit9794633b4e9fefd83fa39c2fd05e9ac8068b744d (patch)
tree8df50a877ce0a80d743fe9d3f928061b83421c77 /t
parent1caaa858ccec11adaa3f9a649c15b766da474078 (diff)
downloadgit-9794633b4e9fefd83fa39c2fd05e9ac8068b744d.zip
git-9794633b4e9fefd83fa39c2fd05e9ac8068b744d.tar.gz
git-9794633b4e9fefd83fa39c2fd05e9ac8068b744d.tar.bz2
test-tool bloom: fix memory leaks
Fix memory leaks introduced with these tests in f1294eaf7fb (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>
Diffstat (limited to 't')
-rw-r--r--t/helper/test-bloom.c2
-rwxr-xr-xt/t0095-bloom.sh2
2 files changed, 3 insertions, 1 deletions
diff --git a/t/helper/test-bloom.c b/t/helper/test-bloom.c
index ad3ef1c..6c900ca 100644
--- a/t/helper/test-bloom.c
+++ b/t/helper/test-bloom.c
@@ -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)
}
print_bloom_filter(&filter);
+ free(filter.data);
}
if (!strcmp(argv[1], "get_filter_for_commit")) {
diff --git a/t/t0095-bloom.sh b/t/t0095-bloom.sh
index 5945973..daeb4a5 100755
--- a/t/t0095-bloom.sh
+++ b/t/t0095-bloom.sh
@@ -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 &&