git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/5] trailer: display a trailer without its trailing newline

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 7, 2014, 19:26 UTC
Message-ID
<xmqqd28yg6cz.fsf@gitster.dls.corp.google.com>
In-Reply-To
<20141107192239.GC5695@peff.net>
Jeff King <peff@peff.net> writes:
Show 21 quoted lines
> 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.
Previous: Jeff KingNext: Christian Couder
Message 5 of 13 in “Small "git interpret-trailers" fixes”
  1. 0/5 Small "git interpret-trailers" fixesChristian Couder, Nov 7, 2014
  2. 1/5 trailer: ignore comment lines inside the trailersChristian Couder, Nov 7, 2014
  3. 2/5 trailer: display a trailer without its trailing newlineChristian Couder, Nov 7, 2014
  4. Jeff KingNov 7, 2014
  5. Junio C HamanoNov 7, 2014
  6. 3/5 commit: make ignore_non_trailer() non staticChristian Couder, Nov 7, 2014
  7. 4/5 trailer: reuse ignore_non_trailer() to ignore conflict linesChristian Couder, Nov 7, 2014
  8. Junio C HamanoNov 7, 2014
  9. Christian CouderNov 9, 2014
  10. Junio C HamanoNov 9, 2014
  11. Junio C HamanoNov 9, 2014
  12. Junio C HamanoNov 9, 2014
  13. 5/5 trailer: add test with an old style conflict blockChristian Couder, Nov 7, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.