mirror of
https://github.com/git/git.git
synced 2024-09-28 17:22:20 +02:00
branch: fix a leak in setup_tracking
The commit d3115660b4 (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 <rjusto@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
caee1d669c
commit
861c56f6f9
2
branch.c
2
branch.c
@ -37,7 +37,7 @@ static int find_tracked_branch(struct remote *remote, void *priv)
|
||||
if (!remote_find_tracking(remote, &tracking->spec)) {
|
||||
switch (++tracking->matches) {
|
||||
case 1:
|
||||
string_list_append(tracking->srcs, tracking->spec.src);
|
||||
string_list_append_nodup(tracking->srcs, tracking->spec.src);
|
||||
tracking->remote = remote->name;
|
||||
break;
|
||||
case 2:
|
||||
|
Loading…
Reference in New Issue
Block a user