git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-06-09 12:22:40 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

strbuf: use st_add3() in strbuf_grow()

Browse Source 
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe
2026-05-18 22:25:01 +02:00
committed by Junio C Hamano
parent 94f057755b
commit c13d0f7bd4
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
strbuf.c
View File

@@ -106,12 +106,10 @@ 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");
size_t new_len = st_add3(sb->len, extra, 1);
if (new_buf)
sb->buf = NULL;
ALLOC_GROW(sb->buf, sb->len + extra + 1, sb->alloc);
ALLOC_GROW(sb->buf, new_len, sb->alloc);
if (new_buf)
sb->buf[0] = '\0';
}