From: Patrick Steinhardt Date: Thu, 26 Sep 2024 11:46:43 +0000 (+0200) Subject: builtin/difftool: plug several trivial memory leaks X-Git-Tag: v2.47.0-rc1~3^2~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f795a17154a2aeb80a7f52bfdaeef14fe298d68;p=thirdparty%2Fgit.git builtin/difftool: plug several trivial memory leaks There are several leaking data structures in git-difftool(1). Plug them. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano --- diff --git a/builtin/difftool.c b/builtin/difftool.c index dcc68e190c..1a68ab6699 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -660,6 +660,12 @@ finish: if (fp) fclose(fp); + hashmap_clear_and_free(&working_tree_dups, struct working_tree_entry, entry); + hashmap_clear_and_free(&wt_modified, struct path_entry, entry); + hashmap_clear_and_free(&tmp_modified, struct path_entry, entry); + hashmap_clear_and_free(&submodules, struct pair_entry, entry); + hashmap_clear_and_free(&symlinks2, struct pair_entry, entry); + release_index(&wtindex); free(lbase_dir); free(rbase_dir); strbuf_release(&info); diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index cc917b257e..f67b9345b8 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -11,6 +11,7 @@ Testing basic diff tool invocation GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME +TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh difftool_test_setup ()