builtin/rerere: fix various trivial memory leaks

There are multiple trivial memory leaks in git-rerere(1). Fix those.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/rerere.c b/builtin/rerere.c
index b2efc6f640e18a2f956cdc985ecc2c793120a267..81b65ffa39c2780f9de56d8143d4c53373760e12 100644 (file)
--- a/builtin/rerere.c
+++ b/builtin/rerere.c
@@ -73,11 +73,17 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)
 
        if (!strcmp(argv[0], "forget")) {
                struct pathspec pathspec;
+               int ret;
+
                if (argc < 2)
                        warning(_("'git rerere forget' without paths is deprecated"));
                parse_pathspec(&pathspec, 0, PATHSPEC_PREFER_CWD,
                               prefix, argv + 1);
-               return rerere_forget(the_repository, &pathspec);
+
+               ret = rerere_forget(the_repository, &pathspec);
+
+               clear_pathspec(&pathspec);
+               return ret;
        }
 
        if (!strcmp(argv[0], "clear")) {

diff --git a/rerere.c b/rerere.c
index 3a3888cce2074227f6cb49d2654d7154aeafed67..525ed6cc1ed093ea1705a6de61c0ecc09eed9de9 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -1107,7 +1107,7 @@ fail_exit:
 
 int rerere_forget(struct repository *r, struct pathspec *pathspec)
 {
-       int i, fd;
+       int i, fd, ret;
        struct string_list conflict = STRING_LIST_INIT_DUP;
        struct string_list merge_rr = STRING_LIST_INIT_DUP;
 
@@ -1132,7 +1132,12 @@ int rerere_forget(struct repository *r, struct pathspec *pathspec)
                        continue;
                rerere_forget_one_path(r->index, it->string, &merge_rr);
        }
-       return write_rr(&merge_rr, fd);
+
+       ret = write_rr(&merge_rr, fd);
+
+       string_list_clear(&conflict, 0);
+       string_list_clear(&merge_rr, 1);
+       return ret;
 }
 
 /*

diff --git a/t/t2030-unresolve-info.sh b/t/t2030-unresolve-info.sh
index be3fcdde07562c27da31e7dfe549058f3ced0ea9..b3f6bc97b53d87a4442739d4d62cccd923b55bcd 100755 (executable)
--- a/t/t2030-unresolve-info.sh
+++ b/t/t2030-unresolve-info.sh
@@ -5,6 +5,7 @@ test_description='undoing resolution'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 check_resolve_undo () {

diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index b0a3e84984185d3e88756bbdb98cb9a56a2233eb..213b36fb96242b4e0ed1a59457a94b4fda5ed7a5 100755 (executable)
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -25,6 +25,7 @@ test_description='git rerere
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '