Skip to content

Commit 861c56f

Browse files
rjustogitster
authored andcommitted
branch: fix a leak in setup_tracking
The commit d311566 (branch: add flags and config to inherit tracking, 2021-12-20) replaced in "struct tracking", the member "char *src" by a new "struct string_list *srcs". This caused a modification in find_tracked_branch(). The string returned by remote_find_tracking(), previously assigned to "src", is now added to the string_list "srcs". That string_list is initialized with STRING_LIST_INIT_DUP, which means that what is added is not the given string, but a duplicate. Therefore, the string returned by remote_find_tracking() is leaked. The leak can be reviewed with: $ git branch foo $ git remote add local . $ git fetch local $ git branch --track bar local/foo Direct leak of 24 byte(s) in 1 object(s) allocated from: ... in xrealloc wrapper.c ... in strbuf_grow strbuf.c ... in strbuf_add strbuf.c ... in match_name_with_pattern remote.c ... in query_refspecs remote.c ... in remote_find_tracking remote.c ... in find_tracked_branch branch.c ... in for_each_remote remote.c ... in setup_tracking branch.c ... in create_branch branch.c ... in cmd_branch builtin/branch.c ... in run_builtin git.c Let's fix the leak, using the "_nodup" API to add to the string_list. This way, the string itself will be added instead of being strdup()'d. And when the string_list is cleared, the string will be freed. Signed-off-by: Rubén Justo <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent caee1d6 commit 861c56f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

branch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ static int find_tracked_branch(struct remote *remote, void *priv)
3737
if (!remote_find_tracking(remote, &tracking->spec)) {
3838
switch (++tracking->matches) {
3939
case 1:
40-
string_list_append(tracking->srcs, tracking->spec.src);
40+
string_list_append_nodup(tracking->srcs, tracking->spec.src);
4141
tracking->remote = remote->name;
4242
break;
4343
case 2:

0 commit comments

Comments
 (0)