undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tc/fetch-leak'

Browse Source 
* tc/fetch-leak:
  fetch: plug two leaks on error exit in store_updated_refs

Conflicts:
	builtin/fetch.c
This commit is contained in:
Junio C Hamano 2011-10-17 21:37:12 -07:00
commit 3f7d11c454
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
builtin/fetch.c
View File

@ -379,8 +379,10 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
url = xstrdup("foreign"); url = xstrdup("foreign");
rm = ref_map; rm = ref_map;
if (check_everything_connected(iterate_ref_map, 0, &rm)) if (check_everything_connected(iterate_ref_map, 0, &rm)) {
return error(_("%s did not send all necessary objects\n"), url); rc = error(_("%s did not send all necessary objects\n"), url);
goto abort;
}
for (rm = ref_map; rm; rm = rm->next) { for (rm = ref_map; rm; rm = rm->next) {
struct ref *ref = NULL; struct ref *ref = NULL;
@ -462,12 +464,15 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
fprintf(stderr, " %s\n", note); fprintf(stderr, " %s\n", note);
} }
} }
free(url);
fclose(fp);
if (rc & STORE_REF_ERROR_DF_CONFLICT) if (rc & STORE_REF_ERROR_DF_CONFLICT)
error(_("some local refs could not be updated; try running\n" error(_("some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting " " 'git remote prune %s' to remove any old, conflicting "
"branches"), remote_name); "branches"), remote_name);
abort:
free(url);
fclose(fp);
return rc; return rc;
} }