Skip to content

Commit

Permalink
remote.c: don't leak the base branch name in format_tracking_info
Browse files Browse the repository at this point in the history
Found by scan.coverity.com (Id: 1127809)

Signed-off-by: Stefan Beller <stefanbeller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Stefan Beller authored and Junio C Hamano committed Aug 10, 2014
1 parent 32f5660 commit 2f50bab
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions remote.c
Original file line number Diff line number Diff line change
Expand Up @@ -1925,7 +1925,7 @@ int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs)
int format_tracking_info(struct branch *branch, struct strbuf *sb)
{
int ours, theirs;
const char *base;
char *base;
int upstream_is_gone = 0;

switch (stat_tracking_info(branch, &ours, &theirs)) {
Expand All @@ -1941,8 +1941,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
break;
}

base = branch->merge[0]->dst;
base = shorten_unambiguous_ref(base, 0);
base = shorten_unambiguous_ref(branch->merge[0]->dst, 0);
if (upstream_is_gone) {
strbuf_addf(sb,
_("Your branch is based on '%s', but the upstream is gone.\n"),
Expand Down Expand Up @@ -1988,6 +1987,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
strbuf_addf(sb,
_(" (use \"git pull\" to merge the remote branch into yours)\n"));
}
free(base);
return 1;
}

Expand Down

0 comments on commit 2f50bab

Please sign in to comment.