All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "René Scharfe" <l.s.r@web.de>
Cc: Jeff King <peff@peff.net>, Git List <git@vger.kernel.org>
Subject: Re: [PATCH] fmt-merge-msg: avoid leaking strbuf in shortlog()
Date: Fri, 08 Dec 2017 10:44:15 -0800	[thread overview]
Message-ID: <xmqq609h83gg.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <e1daa2b6-004b-ad66-b84d-84fa70a44baf@web.de> ("René Scharfe"'s message of "Fri, 8 Dec 2017 18:29:31 +0100")

René Scharfe <l.s.r@web.de> writes:

> Am 07.12.2017 um 22:27 schrieb Jeff King:
>> Grepping for "list_append.*detach" shows a few other possible cases in
>> transport-helper.c, which I think are leaks.
>
> -- >8 --
> Subject: [PATCH] transport-helper: plug strbuf and string_list leaks
>
> Transfer ownership of detached strbufs to string_lists of the
> duplicating variety by calling string_list_append_nodup() instead of
> string_list_append() to avoid duplicating and then leaking the buffer.
>
> While at it make sure to release the string_list when done;
> push_refs_with_export() already does that.
>
> Reported-by: Jeff King <peff@peff.net>
> Signed-off-by: Rene Scharfe <l.s.r@web.de>
> ---
>  transport-helper.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/transport-helper.c b/transport-helper.c
> index bf05a2dcf1..f682e7c534 100644
> --- a/transport-helper.c
> +++ b/transport-helper.c
> @@ -882,7 +882,8 @@ static int push_refs_with_push(struct transport *transport,
>  			struct strbuf cas = STRBUF_INIT;
>  			strbuf_addf(&cas, "%s:%s",
>  				    ref->name, oid_to_hex(&ref->old_oid_expect));
> -			string_list_append(&cas_options, strbuf_detach(&cas, NULL));
> +			string_list_append_nodup(&cas_options,
> +						 strbuf_detach(&cas, NULL));
>  		}
>  	}
>  	if (buf.len == 0) {
> @@ -897,6 +898,7 @@ static int push_refs_with_push(struct transport *transport,
>  	strbuf_addch(&buf, '\n');
>  	sendline(data, &buf);
>  	strbuf_release(&buf);
> +	string_list_release(&cas_options, 0);

There is no such function; you meant _clear() perhaps?

  reply	other threads:[~2017-12-08 18:44 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 [this message]
2017-12-08 20:10       ` René Scharfe
2017-12-08 21:11     ` Jeff King
2017-12-07 21:47 ` Junio C Hamano
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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqq609h83gg.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=l.s.r@web.de \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.