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

builtin/merge-tree: fix leaking `-X` strategy options 

The `-X` switch for git-merge-tree(1) will push each option into a local
`xopts` vector that we then end up parsing. The vector never gets freed
though, causing a memory leak. Plug it.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Patrick Steinhardt 2024-08-22 11:17:21 +02:00 committed by Junio C Hamano
parent 82ea7e59b2
commit ff0935b96e
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
builtin/merge-tree.c
View File

@ -533,6 +533,7 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix)
int expected_remaining_argc;
int original_argc;
const char *merge_base = NULL;
int ret;

const char * const merge_tree_usage[] = {
N_("git merge-tree [--write-tree] [<options>] <branch1> <branch2>"),
@ -625,7 +626,9 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix)
strbuf_list_free(split);
}
strbuf_release(&buf);
return 0;

ret = 0;
goto out;
}

/* Figure out which mode to use */
@ -664,7 +667,11 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix)

/* Do the relevant type of merge */
if (o.mode == MODE_REAL)
return real_merge(&o, merge_base, argv[0], argv[1], prefix);
ret = real_merge(&o, merge_base, argv[0], argv[1], prefix);
else
return trivial_merge(argv[0], argv[1], argv[2]);
ret = trivial_merge(argv[0], argv[1], argv[2]);

out:
strvec_clear(&xopts);
return ret;
}

1
t/t4301-merge-tree-write-tree.sh
View File

@ -2,6 +2,7 @@

test_description='git merge-tree --write-tree'

TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh

# This test is ort-specific