Skip to content

Commit

Permalink
fetch: plug two leaks on error exit in store_updated_refs
Browse files Browse the repository at this point in the history
Close FETCH_HEAD and release the string url even if we have to leave the
function store_updated_refs() early.

Reported-by: Chris Wilson <cwilson@vigilantsw.com>
Helped-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Tay Ray Chuan authored and Junio C Hamano committed Oct 7, 2011
1 parent 6b67e0d commit 9516a59
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions builtin/fetch.c
Original file line number Diff line number Diff line change
Expand Up @@ -423,8 +423,10 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
else
url = xstrdup("foreign");

if (check_everything_connected(ref_map, 0))
return error(_("%s did not send all necessary objects\n"), url);
if (check_everything_connected(ref_map, 0)) {
rc = error(_("%s did not send all necessary objects\n"), url);
goto abort;
}

for (rm = ref_map; rm; rm = rm->next) {
struct ref *ref = NULL;
Expand Down Expand Up @@ -506,12 +508,15 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
fprintf(stderr, " %s\n", note);
}
}
free(url);
fclose(fp);

if (rc & STORE_REF_ERROR_DF_CONFLICT)
error(_("some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting "
"branches"), remote_name);

abort:
free(url);
fclose(fp);
return rc;
}

Expand Down

0 comments on commit 9516a59

Please sign in to comment.