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

submodule--helper: fix a leak in module_add()

Browse Source 
Fix a leak in module_path(), since a6226fd772 (submodule--helper:
convert the bulk of cmd_add() to C, 2021-08-10), we've been freeing
add_data.sm_path, but in this case we clobbered it, and didn't free
the value we clobbered.

This makes test 28 of "t/t7400-submodule-basic.sh" ("submodule add in
subdirectory") pass when we're compiled with SANITIZE=leak..

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:20 +02:00 committed by Junio C Hamano
parent 4e83605d38
commit 623bd7d154
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/submodule--helper.c
View File

@ -3314,8 +3314,12 @@ static int module_add(int argc, const char **argv, const char *prefix)
else else
add_data.sm_path = xstrdup(argv[1]); add_data.sm_path = xstrdup(argv[1]);
if (prefix && *prefix && !is_absolute_path(add_data.sm_path)) if (prefix && *prefix && !is_absolute_path(add_data.sm_path)) {
add_data.sm_path = xstrfmt("%s%s", prefix, add_data.sm_path); char *sm_path = add_data.sm_path;
add_data.sm_path = xstrfmt("%s%s", prefix, sm_path);
free(sm_path);
}
if (starts_with_dot_dot_slash(add_data.repo) || if (starts_with_dot_dot_slash(add_data.repo) ||
starts_with_dot_slash(add_data.repo)) { starts_with_dot_slash(add_data.repo)) {