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

bundle.c: fix memory leak 

There was one continue statement without an accompanying `free(ref)`.
Instead of adding that, replace all the free&&continue with a goto
just after writing the refs, where we'd do the free anyway and then
reloop.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Stefan Beller 2015-03-10 16:51:48 -07:00 committed by Junio C Hamano
parent 04f20c04c6
commit c8a571d8bc
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bundle.c
View File

@ -334,7 +334,7 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs)
if (e->item->flags & UNINTERESTING) if (e->item->flags & UNINTERESTING)
continue; continue;
if (dwim_ref(e->name, strlen(e->name), sha1, &ref) != 1) if (dwim_ref(e->name, strlen(e->name), sha1, &ref) != 1)
continue; goto skip_write_ref;
if (read_ref_full(e->name, RESOLVE_REF_READING, sha1, &flag)) if (read_ref_full(e->name, RESOLVE_REF_READING, sha1, &flag))
flag = 0; flag = 0;
display_ref = (flag & REF_ISSYMREF) ? e->name : ref; display_ref = (flag & REF_ISSYMREF) ? e->name : ref;
@ -342,7 +342,7 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs)
if (e->item->type == OBJ_TAG && if (e->item->type == OBJ_TAG &&
!is_tag_in_date_range(e->item, revs)) { !is_tag_in_date_range(e->item, revs)) {
e->item->flags |= UNINTERESTING; e->item->flags |= UNINTERESTING;
continue; goto skip_write_ref;
} }


/* /*
@ -357,8 +357,7 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs)
if (!(e->item->flags & SHOWN) && e->item->type == OBJ_COMMIT) { if (!(e->item->flags & SHOWN) && e->item->type == OBJ_COMMIT) {
warning(_("ref '%s' is excluded by the rev-list options"), warning(_("ref '%s' is excluded by the rev-list options"),
e->name); e->name);
free(ref); goto skip_write_ref;
continue;
} }
/* /*
* If you run "git bundle create bndl v1.0..v2.0", the * If you run "git bundle create bndl v1.0..v2.0", the
@ -388,8 +387,7 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs)
obj->flags |= SHOWN; obj->flags |= SHOWN;
add_pending_object(revs, obj, e->name); add_pending_object(revs, obj, e->name);
} }
free(ref); goto skip_write_ref;
continue;
} }


ref_count++; ref_count++;
@ -397,6 +395,7 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs)
write_or_die(bundle_fd, " ", 1); write_or_die(bundle_fd, " ", 1);
write_or_die(bundle_fd, display_ref, strlen(display_ref)); write_or_die(bundle_fd, display_ref, strlen(display_ref));
write_or_die(bundle_fd, "\n", 1); write_or_die(bundle_fd, "\n", 1);
skip_write_ref:
free(ref); free(ref);
} }