mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tr/maint-strbuf-grow-nul-termination'

Browse Source 
* tr/maint-strbuf-grow-nul-termination:
  strbuf_grow(): maintain nul-termination even for new buffer
This commit is contained in:
Junio C Hamano
2011-09-02 13:18:29 -07:00
parent 8a72864426 8c74ef1e97
commit 5e2b3d7c67
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
strbuf.c
View File

@ -30,10 +30,8 @@ void strbuf_init(struct strbuf *sb, size_t hint)
{ {
sb->alloc = sb->len = 0; sb->alloc = sb->len = 0;
sb->buf = strbuf_slopbuf; sb->buf = strbuf_slopbuf;
if (hint) { if (hint)
strbuf_grow(sb, hint); strbuf_grow(sb, hint);
sb->buf[0] = '\0';
}
} }
void strbuf_release(struct strbuf *sb) void strbuf_release(struct strbuf *sb)
@ -65,12 +63,15 @@ void strbuf_attach(struct strbuf *sb, void *buf, size_t len, size_t alloc)
void strbuf_grow(struct strbuf *sb, size_t extra) void strbuf_grow(struct strbuf *sb, size_t extra)
{ {
int new_buf = !sb->alloc;
if (unsigned_add_overflows(extra, 1) || if (unsigned_add_overflows(extra, 1) ||
unsigned_add_overflows(sb->len, extra + 1)) unsigned_add_overflows(sb->len, extra + 1))
die("you want to use way too much memory"); die("you want to use way too much memory");
if (!sb->alloc) if (new_buf)
sb->buf = NULL; sb->buf = NULL;
ALLOC_GROW(sb->buf, sb->len + extra + 1, sb->alloc); ALLOC_GROW(sb->buf, sb->len + extra + 1, sb->alloc);
if (new_buf)
sb->buf[0] = '\0';
} }
void strbuf_trim(struct strbuf *sb) void strbuf_trim(struct strbuf *sb)