From: Stefan Beller <stefanbeller@gmail.com>
To: git@vger.kernel.org, gitster@pobox.com, peff@peff.net
Cc: Stefan Beller <stefanbeller@gmail.com>
Subject: [PATCH] remote.c: don't leak the base branch name in format_tracking_info
Date: Sun, 10 Aug 2014 21:43:33 +0200 [thread overview]
Message-ID: <1407699813-1460-1-git-send-email-stefanbeller@gmail.com> (raw)
In-Reply-To: <20140810193242.GA9886@peff.net>
Found by scan.coverity.com (Id: 1127809)
Signed-off-by: Stefan Beller <stefanbeller@gmail.com>
---
remote.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/remote.c b/remote.c
index 3d6c86a..894db09 100644
--- a/remote.c
+++ b/remote.c
@@ -1920,7 +1920,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)) {
@@ -1936,8 +1936,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"),
@@ -1983,6 +1982,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;
}
--
2.1.0.rc2
next prev parent reply other threads:[~2014-08-10 19:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-10 13:57 [PATCH 1/2] remote.c: don't leak the base branch name in format_tracking_info Stefan Beller
2014-08-10 13:57 ` [PATCH 2/2] clone.c: don't leak memory in cmd_clone Stefan Beller
2014-08-10 15:14 ` [PATCH 1/2] remote.c: don't leak the base branch name in format_tracking_info Stefan Beller
2014-08-10 19:32 ` Jeff King
2014-08-10 19:43 ` Stefan Beller [this message]
2014-08-10 23:03 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1407699813-1460-1-git-send-email-stefanbeller@gmail.com \
--to=stefanbeller@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).