Merge branch 'jc/maint-strbuf-add-fix-doubling'

* jc/maint-strbuf-add-fix-doubling: strbuf_addbuf(): allow passing the same buf to dst and src
git-mirror · Jan 20, 2010 · 886932e · 886932e
2 parents 71b3ef1 + 81d2cae
commit 886932e
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/strbuf.h b/strbuf.h
@@ -104,6 +104,7 @@ static inline void strbuf_addstr(struct strbuf *sb, const char *s) {
 	strbuf_add(sb, s, strlen(s));
 }
 static inline void strbuf_addbuf(struct strbuf *sb, const struct strbuf *sb2) {
+	strbuf_grow(sb, sb2->len);
 	strbuf_add(sb, sb2->buf, sb2->len);
 }
 extern void strbuf_adddup(struct strbuf *sb, size_t pos, size_t len);