mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

submodule: fix leaking submodule entry list

Browse Source 
The submodule entry list returned by `submodules_of_tree()` is never
completely free'd by its only caller. Introduce a new function that
free's the list for us and call it.

While at it, also fix the leaking `branch_point` string.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2024-09-30 11:13:27 +02:00
committed by Junio C Hamano
parent 666643fa89
commit 5cca114973
4 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
branch.c
View File

@ -738,6 +738,7 @@ static int submodule_create_branch(struct repository *r,
strbuf_release(&child_err); strbuf_release(&child_err);
strbuf_release(&out_buf); strbuf_release(&out_buf);
free(out_prefix);
return ret; return ret;
} }
@ -794,7 +795,7 @@ void create_branches_recursively(struct repository *r, const char *name,
create_branch(r, name, start_committish, force, 0, reflog, quiet, create_branch(r, name, start_committish, force, 0, reflog, quiet,
BRANCH_TRACK_NEVER, dry_run); BRANCH_TRACK_NEVER, dry_run);
if (dry_run) if (dry_run)
return; goto out;
/* /*
* NEEDSWORK If tracking was set up in the superproject but not the * NEEDSWORK If tracking was set up in the superproject but not the
* submodule, users might expect "git branch --recurse-submodules" to * submodule, users might expect "git branch --recurse-submodules" to
@ -815,8 +816,11 @@ void create_branches_recursively(struct repository *r, const char *name,
die(_("submodule '%s': cannot create branch '%s'"), die(_("submodule '%s': cannot create branch '%s'"),
submodule_entry_list.entries[i].submodule->name, submodule_entry_list.entries[i].submodule->name,
name); name);
repo_clear(submodule_entry_list.entries[i].repo);
} }
out:
submodule_entry_list_release(&submodule_entry_list);
free(branch_point);
} }
void remove_merge_branch_state(struct repository *r) void remove_merge_branch_state(struct repository *r)

15
submodule-config.c
View File

@ -901,8 +901,9 @@ static void traverse_tree_submodules(struct repository *r,
struct submodule_tree_entry *st_entry; struct submodule_tree_entry *st_entry;
struct name_entry name_entry; struct name_entry name_entry;
char *tree_path = NULL; char *tree_path = NULL;
char *tree_buf;
fill_tree_descriptor(r, &tree, treeish_name); tree_buf = fill_tree_descriptor(r, &tree, treeish_name);
while (tree_entry(&tree, &name_entry)) { while (tree_entry(&tree, &name_entry)) {
if (prefix) if (prefix)
tree_path = tree_path =
@ -930,6 +931,8 @@ static void traverse_tree_submodules(struct repository *r,
&name_entry.oid, out); &name_entry.oid, out);
free(tree_path); free(tree_path);
} }
free(tree_buf);
} }
void submodules_of_tree(struct repository *r, void submodules_of_tree(struct repository *r,
@ -943,6 +946,16 @@ void submodules_of_tree(struct repository *r,
traverse_tree_submodules(r, treeish_name, NULL, treeish_name, out); traverse_tree_submodules(r, treeish_name, NULL, treeish_name, out);
} }
void submodule_entry_list_release(struct submodule_entry_list *list)
{
for (size_t i = 0; i < list->entry_nr; i++) {
free(list->entries[i].name_entry);
repo_clear(list->entries[i].repo);
free(list->entries[i].repo);
}
free(list->entries);
}
void submodule_free(struct repository *r) void submodule_free(struct repository *r)
{ {
if (r->submodule_cache) if (r->submodule_cache)

3
submodule-config.h
View File

@ -136,4 +136,7 @@ struct submodule_entry_list {
void submodules_of_tree(struct repository *r, void submodules_of_tree(struct repository *r,
const struct object_id *treeish_name, const struct object_id *treeish_name,
struct submodule_entry_list *ret); struct submodule_entry_list *ret);
void submodule_entry_list_release(struct submodule_entry_list *list);
#endif /* SUBMODULE_CONFIG_H */ #endif /* SUBMODULE_CONFIG_H */

1
t/t3207-branch-submodule.sh
View File

@ -5,6 +5,7 @@ test_description='git branch submodule tests'
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_DIRECTORY"/lib-rebase.sh . "$TEST_DIRECTORY"/lib-rebase.sh