From 81d2caefedefa40557baf7af846580f35de3f995 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 12 Jan 2010 12:09:54 -0800 Subject: strbuf_addbuf(): allow passing the same buf to dst and src If sb and sb2 are the same (i.e. doubling the string), the underlying strbuf_add() can make sb2->buf invalid by calling strbuf_grow(sb) at the beginning; if realloc(3) done by strbuf_grow() needs to move the string, strbuf_add() will read from an already freed buffer. Signed-off-by: Junio C Hamano --- strbuf.h | 1 + 1 file changed, 1 insertion(+) diff --git a/strbuf.h b/strbuf.h index fa07ecf094..4971743a24 100644 --- a/strbuf.h +++ b/strbuf.h @@ -105,6 +105,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); -- cgit v1.2.1