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>
Michael Haggerty committed
Oct 30, 2013 at 06:32 UTC
e31a17f7416a85ee8c3260f8c8b7519ff7ea82b6
1 file changed
+3
-3
remote.c
+3
-3
@@ -1567,9 +1567,9 @@ static struct ref *get_expanded_map(const struct ref *remote_refs,
1567
struct ref *ret = NULL;
1568
struct ref **tail = &ret;
1569
1570
- char *expn_name;
1571
-
1570
for (ref = remote_refs; ref; ref = ref->next) {
1571
+ char *expn_name = NULL;
1572
+
1573
if (strchr(ref->name, '^'))
1574
continue; /* a dereference item */
1575
if (match_name_with_pattern(refspec->src, ref->name,
@@ -1578,12 +1578,12 @@ static struct ref *get_expanded_map(const struct ref *remote_refs,
1578
struct ref *cpy = copy_ref(ref);
1579
1580
cpy->peer_ref = alloc_ref(expn_name);
1581
- free(expn_name);
1581
if (refspec->force)
1582
cpy->peer_ref->force = 1;
1583
*tail = cpy;
1584
tail = &cpy->next;
1585
}
1586
+ free(expn_name);
1587
}
1588
1589
return ret;