Skip to content

Commit

Permalink
Merge branch 'sb/plug-leaks'
Browse files Browse the repository at this point in the history
* sb/plug-leaks:
  clone.c: don't leak memory in cmd_clone
  remote.c: don't leak the base branch name in format_tracking_info
  • Loading branch information
Junio C Hamano committed Sep 9, 2014
2 parents a75e759 + 50b6773 commit 27fbcf8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions builtin/clone.c
Original file line number Diff line number Diff line change
Expand Up @@ -1004,5 +1004,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
strbuf_release(&key);
strbuf_release(&value);
junk_mode = JUNK_LEAVE_ALL;

free(refspec);
return err;
}
6 changes: 3 additions & 3 deletions remote.c
Original file line number Diff line number Diff line change
Expand Up @@ -1949,7 +1949,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 @@ -1965,8 +1965,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 @@ -2012,6 +2011,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 27fbcf8

Please sign in to comment.