summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-20 14:43:09 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-20 14:43:09 -0800
commit886932e2816ba8554ba0bf6c2c91fdfa6877dd65 (patch)
tree6bb246782bf8857db0e937aba059eb83ef4ccbfe
parent71b3ef11fa0aade4a514c51b83438858a4a3c03b (diff)
parent81d2caefedefa40557baf7af846580f35de3f995 (diff)
downloadgit-886932e2816ba8554ba0bf6c2c91fdfa6877dd65.tar.gz
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
-rw-r--r--strbuf.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/strbuf.h b/strbuf.h
index 8ce2a2e54b..fac2dbc24f 100644
--- 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);