kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

get_expanded_map(): avoid memory leak 

The old code could leak *expn_name if match_name_with_pattern()
succeeded but ignore_symref_update() returned true.  So make sure that
*expn_name is freed in any case.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Michael Haggerty 2013-10-30 06:32:57 +01:00 committed by Junio C Hamano
parent f166db26af
commit e31a17f741
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
remote.c
View File

@ -1567,9 +1567,9 @@ static struct ref *get_expanded_map(const struct ref *remote_refs,
struct ref *ret = NULL; struct ref *ret = NULL;
struct ref **tail = &ret; struct ref **tail = &ret;


char *expn_name;

for (ref = remote_refs; ref; ref = ref->next) { for (ref = remote_refs; ref; ref = ref->next) {
char *expn_name = NULL;

if (strchr(ref->name, '^')) if (strchr(ref->name, '^'))
continue; /* a dereference item */ continue; /* a dereference item */
if (match_name_with_pattern(refspec->src, ref->name, if (match_name_with_pattern(refspec->src, ref->name,
@ -1578,12 +1578,12 @@ static struct ref *get_expanded_map(const struct ref *remote_refs,
struct ref *cpy = copy_ref(ref); struct ref *cpy = copy_ref(ref);


cpy->peer_ref = alloc_ref(expn_name); cpy->peer_ref = alloc_ref(expn_name);
free(expn_name);
if (refspec->force) if (refspec->force)
cpy->peer_ref->force = 1; cpy->peer_ref->force = 1;
*tail = cpy; *tail = cpy;
tail = &cpy->next; tail = &cpy->next;
} }
free(expn_name);
} }


return ret; return ret;