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

diff --git a/strbuf.h b/strbuf.h
index 8ce2a2e54b0180ffb8dc573953872ff00dc419b5..fac2dbc24fc654e58840727204043a198d065921 100644 (file)
--- 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);