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

sequencer: fix memory leaks in make_script_with_merges()

Browse Source 
Fix some trivial memory leaks in `make_script_with_merges()`.

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-06-11 11:21:01 +02:00
committed by Junio C Hamano
parent 8909d6e1a1
commit 6e95f4ee03
4 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sequencer.c
View File

@@ -5951,6 +5951,9 @@ static int make_script_with_merges(struct pretty_print_context *pp,
strbuf_release(&oneline); strbuf_release(&oneline);
strbuf_release(&buf); strbuf_release(&buf);
oidset_clear(&interesting);
oidset_clear(&child_seen);
oidset_clear(&shown);
oidmap_free(&commit2todo, 1); oidmap_free(&commit2todo, 1);
oidmap_free(&state.commit2label, 1); oidmap_free(&state.commit2label, 1);
hashmap_clear_and_free(&state.labels, struct labels_entry, entry); hashmap_clear_and_free(&state.labels, struct labels_entry, entry);

1
t/t3418-rebase-continue.sh
View File

@@ -5,6 +5,7 @@ test_description='git rebase --continue tests'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh . ./test-lib.sh
. "$TEST_DIRECTORY"/lib-rebase.sh . "$TEST_DIRECTORY"/lib-rebase.sh

2
t/t3421-rebase-topology-linear.sh
View File

@@ -1,6 +1,8 @@
#!/bin/sh #!/bin/sh
test_description='basic rebase topology tests' test_description='basic rebase topology tests'
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh . ./test-lib.sh
. "$TEST_DIRECTORY"/lib-rebase.sh . "$TEST_DIRECTORY"/lib-rebase.sh

1
t/t3434-rebase-i18n.sh
View File

@@ -17,6 +17,7 @@ Initial setup:
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh . ./test-lib.sh
compare_msg () { compare_msg () {