undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

submodule--helper: fix "sm_path" and other "module_cb_list" leaks

Browse Source 
Fix leaks in "struct module_cb_list" and the "struct module_cb" which
it contains, these fix leaks in e83e3333b5 (submodule: port submodule
subcommand 'summary' from shell to C, 2020-08-13).

The "sm_path" should always have been a "char *", not a "const
char *", we always create it with xstrdup().

We can't mark any tests passing passing with SANITIZE=leak using
"TEST_PASSES_SANITIZE_LEAK=true" as a result of this change, but
"t7401-submodule-summary.sh" gets closer to passing as a result of
this change.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Reviewed-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2022-09-01 01:14:15 +02:00 committed by Junio C Hamano
parent 61adac6c4b
commit 980416e469
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
builtin/submodule--helper.c
View File

@ -748,16 +748,34 @@ struct module_cb {
struct object_id oid_src;
struct object_id oid_dst;
char status;
const char *sm_path;
char *sm_path;
};
#define MODULE_CB_INIT { 0 }
static void module_cb_release(struct module_cb *mcb)
{
free(mcb->sm_path);
}
struct module_cb_list {
struct module_cb **entries;
int alloc, nr;
};
#define MODULE_CB_LIST_INIT { 0 }
static void module_cb_list_release(struct module_cb_list *mcbl)
{
int i;
for (i = 0; i < mcbl->nr; i++) {
struct module_cb *mcb = mcbl->entries[i];
module_cb_release(mcb);
free(mcb);
}
free(mcbl->entries);
}
struct summary_cb {
int argc;
const char **argv;
@ -1101,6 +1119,7 @@ static int compute_summary_module_list(struct object_id *head_oid,
cleanup:
strvec_clear(&diff_args);
release_revisions(&rev);
module_cb_list_release(&list);
return ret;
}

1
t/t7401-submodule-summary.sh
View File

@ -17,6 +17,7 @@ This test script tries to verify the sanity of summary subcommand of git submodu
# various reasons, one of them being that there are lots of commands taking place
# outside of 'test_expect_success' block, which is no longer in good-style.
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
add_file () {