From: Junio C Hamano <gitster@pobox.com>
To: cornelius.weig@tngtech.com
Cc: peff@peff.net, git@vger.kernel.org
Subject: Re: [PATCH v3 2/3] refs: add option core.logAllRefUpdates = always
Date: Mon, 30 Jan 2017 14:57:15 -0800 [thread overview]
Message-ID: <xmqq8tpstaus.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqq37g0us5p.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Mon, 30 Jan 2017 13:58:10 -0800")
Junio C Hamano <gitster@pobox.com> writes:
>> diff --git a/builtin/checkout.c b/builtin/checkout.c
>> index bfe685c..81ea2ed 100644
>> --- a/builtin/checkout.c
>> +++ b/builtin/checkout.c
>> @@ -612,14 +612,12 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
>> const char *old_desc, *reflog_msg;
>> if (opts->new_branch) {
>> if (opts->new_orphan_branch) {
>> - if (opts->new_branch_log && !log_all_ref_updates) {
>> + const char *refname = mkpathdup("refs/heads/%s", opts->new_orphan_branch);
>> ...
>> if (ret) {
>> fprintf(stderr, _("Can not do reflog for '%s': %s\n"),
>> opts->new_orphan_branch, err.buf);
>
> Here you need to have another free(), as this block makes an early
> return and you end up leaking refname.
I am building with the attached patch squashed on top.
The extra free(refname) is to plug the leak I pointed out, and the
type of refname is no longer const, because "const char *" cannot be
free()d without casting, and in this codepath I do not see a reason
to mark it as const.
When queued on top of 4e59582ff7 ("Seventh batch for 2.12",
2017-01-23), however, this fails t2017#9 (orphan with -l makes
reflog when core.logAllRefUpdates = false).
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 81ea2eda99..e1a60fd8ea 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -612,7 +612,9 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
const char *old_desc, *reflog_msg;
if (opts->new_branch) {
if (opts->new_orphan_branch) {
- const char *refname = mkpathdup("refs/heads/%s", opts->new_orphan_branch);
+ char *refname;
+
+ refname = mkpathdup("refs/heads/%s", opts->new_orphan_branch);
if (opts->new_branch_log && should_autocreate_reflog(refname)) {
int ret;
struct strbuf err = STRBUF_INIT;
@@ -622,6 +624,7 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
fprintf(stderr, _("Can not do reflog for '%s': %s\n"),
opts->new_orphan_branch, err.buf);
strbuf_release(&err);
+ free(refname);
return;
}
strbuf_release(&err);
next prev parent reply other threads:[~2017-01-30 22:57 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-25 0:19 [PATCH] tag: add tag.createReflog option cornelius.weig
2017-01-25 5:06 ` Pranit Bauva
2017-01-25 18:00 ` Jeff King
2017-01-25 18:10 ` Junio C Hamano
2017-01-25 21:21 ` Cornelius Weig
2017-01-25 21:33 ` Jeff King
2017-01-25 21:43 ` Junio C Hamano
2017-01-25 22:56 ` Junio C Hamano
2017-01-25 23:40 ` Cornelius Weig
2017-01-26 1:16 ` [PATCH] refs: add option core.logAllRefUpdates = always cornelius.weig
2017-01-26 1:16 ` cornelius.weig
2017-01-26 3:35 ` Jeff King
2017-01-26 14:06 ` Cornelius Weig
2017-01-26 14:46 ` Jeff King
2017-01-26 22:31 ` [PATCH v2 1/3] config: add markup to core.logAllRefUpdates doc cornelius.weig
2017-01-26 22:31 ` [PATCH v2 2/3] refs: add option core.logAllRefUpdates = always cornelius.weig
2017-01-26 23:39 ` Junio C Hamano
2017-01-26 22:31 ` [PATCH v2 3/3] update-ref: add test cases for bare repository cornelius.weig
2017-01-26 23:41 ` Junio C Hamano
2017-01-26 23:24 ` [PATCH v2 1/3] config: add markup to core.logAllRefUpdates doc Junio C Hamano
2017-01-27 10:09 ` [PATCH v3 " cornelius.weig
2017-01-27 10:09 ` [PATCH v3 2/3] refs: add option core.logAllRefUpdates = always cornelius.weig
2017-01-30 21:58 ` Junio C Hamano
2017-01-30 22:57 ` Junio C Hamano [this message]
2017-01-31 13:16 ` Cornelius Weig
2017-01-31 17:11 ` Junio C Hamano
2017-01-30 23:37 ` Jeff King
2017-01-31 14:00 ` Cornelius Weig
2017-01-31 18:21 ` Jeff King
2017-01-31 17:08 ` Junio C Hamano
2017-01-31 20:28 ` Cornelius Weig
2017-01-31 22:02 ` Junio C Hamano
2017-01-27 10:09 ` [PATCH v3 3/3] update-ref: add test cases for bare repository cornelius.weig
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq8tpstaus.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=cornelius.weig@tngtech.com \
--cc=git@vger.kernel.org \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).