From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 07 Nov 2014 19:26:04 GMT
Subject: Re: [PATCH 2/5] trailer: display a trailer without its trailing newline
Message-ID: <xmqqd28yg6cz.fsf@gitster.dls.corp.google.com>
In-Reply-To: <20141107192239.GC5695@peff.net>

Jeff King <peff@peff.net> writes:

> On Fri, Nov 07, 2014 at 07:50:49PM +0100, Christian Couder wrote:
>
>> diff --git a/trailer.c b/trailer.c
>> index 761b763..f4d51ba 100644
>> --- a/trailer.c
>> +++ b/trailer.c
>> @@ -583,8 +583,12 @@ static int parse_trailer(struct strbuf *tok,
>> struct strbuf *val, const char *tra
>>  	strbuf_addch(&seps, '=');
>>  	len = strcspn(trailer, seps.buf);
>>  	strbuf_release(&seps);
>> -	if (len == 0)
>> -		return error(_("empty trailer token in trailer '%s'"), trailer);
>> +	if (len == 0) {
>> +		struct strbuf sb = STRBUF_INIT;
>> +		strbuf_addstr(&sb, trailer);
>> +		strbuf_rtrim(&sb);
>> +		return error(_("empty trailer token in trailer '%s'"), sb.buf);
>> +	}
>
> Doesn't this leak sb.buf?

Yes.  "%.*s" might be your friend.