kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Patrick Steinhardt 2024-08-01 12:40:36 +02:00 committed by Junio C Hamano
parent 1d615afa8d
commit 50ef4e09c3
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/rerere.c
View File

@ -73,11 +73,17 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)


if (!strcmp(argv[0], "forget")) { if (!strcmp(argv[0], "forget")) {
struct pathspec pathspec; struct pathspec pathspec;
int ret;

if (argc < 2) if (argc < 2)
warning(_("'git rerere forget' without paths is deprecated")); warning(_("'git rerere forget' without paths is deprecated"));
parse_pathspec(&pathspec, 0, PATHSPEC_PREFER_CWD, parse_pathspec(&pathspec, 0, PATHSPEC_PREFER_CWD,
prefix, argv + 1); 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")) { if (!strcmp(argv[0], "clear")) {

9
rerere.c
View File

@ -1107,7 +1107,7 @@ fail_exit:


int rerere_forget(struct repository *r, struct pathspec *pathspec) 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 conflict = STRING_LIST_INIT_DUP;
struct string_list merge_rr = 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; continue;
rerere_forget_one_path(r->index, it->string, &merge_rr); 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;
} }


/* /*

1
t/t2030-unresolve-info.sh
View File

@ -5,6 +5,7 @@ test_description='undoing resolution'
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


check_resolve_undo () { check_resolve_undo () {

1
t/t4200-rerere.sh
View File

@ -25,6 +25,7 @@ test_description='git rerere
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_expect_success 'setup' ' test_expect_success 'setup' '