Merge branch 'jk/strbuf-detach-always-non-null'

* jk/strbuf-detach-always-non-null: strbuf: always return a non-NULL value from strbuf_detach
2012-10-25 06:43:03 -04:00 · 2012-10-25 06:43:03 -04:00 · 2cfceefaca
parent bbbd057389 08ad56f3f0
commit 2cfceefaca
1 changed files with 3 additions and 1 deletions
--- a/strbuf.c
+++ b/strbuf.c
@ -44,7 +44,9 @@ void strbuf_release(struct strbuf *sb)

 char *strbuf_detach(struct strbuf *sb, size_t *sz)
 {
-	char *res = sb->alloc ? sb->buf : NULL;
+	char *res;
+	strbuf_grow(sb, 0);
+	res = sb->buf;
 	if (sz)
 		*sz = sb->len;
 	strbuf_init(sb, 0);