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

Re: [PATCH 1/2] strbuf: use st_add3() in strbuf_grow()

From
Junio C Hamano <gitster@pobox.com>
Date
May 14, 2026, 19:07 UTC
Message-ID
<xmqqo6ihg690.fsf@gitster.g>
In-Reply-To
<c6e9b337-c4fc-4cbd-ac32-e8d3814749b0@web.de>
René Scharfe <l.s.r@web.de> writes:
Show 24 quoted lines
> Simplify the code by calling st_add3() to do overflow checks instead of
> open-coding it.  This changes the error message to include the offending
> summands, which can be helpful when tracking down the cause.
>
> Signed-off-by: René Scharfe <l.s.r@web.de>
> ---
>  strbuf.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/strbuf.c b/strbuf.c
> index 3e04addc22..bb04d3910e 100644
> --- a/strbuf.c
> +++ b/strbuf.c
> @@ -106,12 +106,9 @@ void strbuf_attach(struct strbuf *sb, void *buf, size_t len, size_t alloc)
>  void strbuf_grow(struct strbuf *sb, size_t extra)
>  {
>  	int new_buf = !sb->alloc;
> -	if (unsigned_add_overflows(extra, 1) ||
> -	    unsigned_add_overflows(sb->len, extra + 1))
> -		die("you want to use way too much memory");
>  	if (new_buf)
>  		sb->buf = NULL;
> -	ALLOC_GROW(sb->buf, sb->len + extra + 1, sb->alloc);
> +	ALLOC_GROW(sb->buf, st_add3(sb->len, extra, 1), sb->alloc);

ALLOC_GROW() being a macro that references its second argument three times, doesn't this rewrite rely on the compiler being clever enough to notice that checking for the same overflow three times is pointless and does it only once? I guess the original has the same issue already, so this may not be so bad but it makes me feel a bit queasy.

>  	if (new_buf)
>  		sb->buf[0] = '\0';
>  }
Previous: Jeff KingNext: René Scharfe
Message 9 of 18 in “strbuf: use st_add3() in strbuf_grow()”
  1. 1/2 strbuf: use st_add3() in strbuf_grow()René Scharfe, May 14, 2026
  2. 2/2 use __builtin_add_overflow() in st_add() with ClangRené Scharfe, May 14, 2026
  3. Junio C HamanoMay 14, 2026
  4. René ScharfeMay 14, 2026
  5. René ScharfeMay 15, 2026
  6. Jeff KingMay 15, 2026
  7. René ScharfeMay 15, 2026
  8. Jeff KingMay 15, 2026
  9. Junio C HamanoMay 14, 2026
  10. René ScharfeMay 14, 2026
  11. Jeff KingMay 15, 2026
  12. René ScharfeMay 15, 2026
  13. Jeff KingMay 15, 2026
  14. 0/2 use __builtin_add_overflow() in st_add() with ClangRené Scharfe, May 18, 2026
  15. 2/2 use __builtin_add_overflow() in st_add() with ClangRené Scharfe, May 18, 2026
  16. 1/2 strbuf: use st_add3() in strbuf_grow()René Scharfe, May 18, 2026
  17. Jeff KingMay 19, 2026
  18. Junio C HamanoMay 19, 2026

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.