From: Junio C Hamano <gitster@pobox.com>
To: "René Scharfe" <l.s.r@web.de>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [PATCH] fmt-merge-msg: avoid leaking strbuf in shortlog()
Date: Thu, 07 Dec 2017 13:47:14 -0800 [thread overview]
Message-ID: <xmqq4lp2cisd.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <b2238da3-9eba-1521-f4ca-3b805f103555@web.de> ("René Scharfe"'s message of "Thu, 7 Dec 2017 21:22:49 +0100")
René Scharfe <l.s.r@web.de> writes:
> Use string_list_append_nodup() instead of string_list_append() to hand
> over ownership of a detached strbuf and thus avoid leaking its memory.
>
> Signed-off-by: Rene Scharfe <l.s.r@web.de>
> ---
> builtin/fmt-merge-msg.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
> index 22034f87e7..8e8a15ea4a 100644
> --- a/builtin/fmt-merge-msg.c
> +++ b/builtin/fmt-merge-msg.c
> @@ -377,7 +377,8 @@ static void shortlog(const char *name,
> string_list_append(&subjects,
> oid_to_hex(&commit->object.oid));
> else
> - string_list_append(&subjects, strbuf_detach(&sb, NULL));
> + string_list_append_nodup(&subjects,
> + strbuf_detach(&sb, NULL));
> }
>
> if (opts->credit_people)
What is leaked comes from strbuf, so the title is not a lie, but I
tend to think that this leak is caused by a somewhat strange
string_list API. The subjects string-list is initialized as a "dup"
kind, but a caller that wants to avoid leaking can (and should) use
_nodup() call to add a string without duping. It all feels a bit
too convoluted.
The patch looks good.
next prev parent reply other threads:[~2017-12-07 21:47 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-07 20:22 [PATCH] fmt-merge-msg: avoid leaking strbuf in shortlog() René Scharfe
2017-12-07 21:27 ` Jeff King
2017-12-08 17:29 ` René Scharfe
2017-12-08 18:44 ` Junio C Hamano
2017-12-08 20:10 ` René Scharfe
2017-12-08 21:11 ` Jeff King
2017-12-07 21:47 ` Junio C Hamano [this message]
2017-12-08 10:14 ` Jeff King
2017-12-08 17:29 ` René Scharfe
2017-12-08 18:37 ` Junio C Hamano
2017-12-08 21:28 ` Jeff King
2017-12-18 19:18 ` René Scharfe
2017-12-19 11:38 ` Jeff King
2017-12-19 18:26 ` René Scharfe
2017-12-20 13:05 ` Jeff King
2017-12-08 21:17 ` Jeff King
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=xmqq4lp2cisd.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=l.s.r@web.de \
/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).