diff options
| author | Patrick Steinhardt <ps@pks.im> | 2024-11-05 07:16:58 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-11-04 22:37:52 -0800 |
| commit | e29ff075e082ecdc6ee85baea83d32d4a055d186 (patch) | |
| tree | 8537ee0f474b8045d1ea3e86e9b5ff7ef4da4b84 | |
| parent | builtin/grep: fix leak with `--max-count=0` (diff) | |
| download | git-e29ff075e082ecdc6ee85baea83d32d4a055d186.tar.gz git-e29ff075e082ecdc6ee85baea83d32d4a055d186.zip | |
revision: fix leaking bloom filters
The memory allocated by `prepare_to_use_bloom_filter()` is not released
by `release_revisions()`, causing a memory leak. Plug it.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | revision.c | 5 | ||||
| -rwxr-xr-x | t/t4216-log-bloom.sh | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/revision.c b/revision.c index f5f5b84f2b..8df75b8224 100644 --- a/revision.c +++ b/revision.c @@ -3227,6 +3227,11 @@ void release_revisions(struct rev_info *revs) clear_decoration(&revs->treesame, free); line_log_free(revs); oidset_clear(&revs->missing_commits); + + for (int i = 0; i < revs->bloom_keys_nr; i++) + clear_bloom_key(&revs->bloom_keys[i]); + FREE_AND_NULL(revs->bloom_keys); + revs->bloom_keys_nr = 0; } static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child) diff --git a/t/t4216-log-bloom.sh b/t/t4216-log-bloom.sh index 3f163dc396..8d22338f6a 100755 --- a/t/t4216-log-bloom.sh +++ b/t/t4216-log-bloom.sh @@ -4,6 +4,7 @@ test_description='git log for a path with Bloom filters' GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME +TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh . "$TEST_DIRECTORY"/lib-chunk.sh |