merge-base: free() allocated "struct commit **" list
Fix a memory leak in 53eda89b2fe (merge-base: teach "git merge-base" to drive underlying merge_bases_many(), 2008-07-30) by calling free() on the "struct commit **" list used by "git merge-base". This gets e.g. "t6010-merge-base.sh" closer to passing under SANITIZE=leak, it failed 8 tests before when compiled with that option, and now fails only 5 tests. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Mar 4, 2022 at 19:32 UTC
e69fe2e460080771e1de43f2e8b76adda2252c5f
1 file changed
+4
-1
builtin/merge-base.c
+4
-1
@@ -138,6 +138,7 @@ int cmd_merge_base(int argc, const char **argv, const char *prefix)
138
int rev_nr = 0;
139
int show_all = 0;
140
int cmdmode = 0;
141
+ int ret;
142
143
struct option options[] = {
144
OPT_BOOL('a', "all", &show_all, N_("output all common ancestors")),
@@ -186,5 +187,7 @@ int cmd_merge_base(int argc, const char **argv, const char *prefix)
187
ALLOC_ARRAY(rev, argc);
188
while (argc-- > 0)
189
rev[rev_nr++] = get_commit_reference(*argv++);
189
- return show_merge_base(rev, rev_nr, show_all);
190
+ ret = show_merge_base(rev, rev_nr, show_all);
191
+ free(rev);
192
+ return ret;
193
}