From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Sep 2007 09:26:06 +0000 (-0700)
Subject: strbuf_setlen(): do not barf on setting length of an empty buffer to 0
X-Git-Tag: v1.5.4-rc0~387^2~10
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a8f3e2219c237661a30b54fe23d58e055f0b548c;p=git.git

strbuf_setlen(): do not barf on setting length of an empty buffer to 0

strbuf_setlen() expect to be able to NUL terminate the buffer,
but a completely empty strbuf could have an empty buffer with 0
allocation; both the assert() and the assignment for NUL
termination would fail.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/strbuf.h b/strbuf.h
index 567e2d17d..3b19de304 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -65,14 +65,17 @@ static inline void strbuf_swap(struct strbuf *a, struct strbuf *b) {
 static inline size_t strbuf_avail(struct strbuf *sb) {
 	return sb->alloc ? sb->alloc - sb->len - 1 : 0;
 }
+
+extern void strbuf_grow(struct strbuf *, size_t);
+
 static inline void strbuf_setlen(struct strbuf *sb, size_t len) {
-	assert (len < sb->alloc);
+	if (!sb->alloc)
+		strbuf_grow(sb, 0);
+	assert(len < sb->alloc);
 	sb->len = len;
 	sb->buf[len] = '\0';
 }
 
-extern void strbuf_grow(struct strbuf *, size_t);
-
 /*----- content related -----*/
 extern void strbuf_rtrim(struct strbuf *);