From: René Scharfe <l.s.r@web.de>
Date: Tue, 13 Sep 2016 16:40:22 +0000 (+0200)
Subject: strbuf: use valid pointer in strbuf_remove()
X-Git-Tag: v2.10.1~25^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8342a417e48385f7ebc19ab46a940ea1fa060ae;p=git

strbuf: use valid pointer in strbuf_remove()

The fourth argument of strbuf_splice() is passed to memcpy(3), which is
not supposed to handle NULL pointers.  Let's be extra careful and use a
valid empty string instead.  It even shortens the source code. :)

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/strbuf.c b/strbuf.c
index 2c08dbb153..e554f1f38c 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -187,7 +187,7 @@ void strbuf_insert(struct strbuf *sb, size_t pos, const void *data, size_t len)
 
 void strbuf_remove(struct strbuf *sb, size_t pos, size_t len)
 {
-	strbuf_splice(sb, pos, len, NULL, 0);
+	strbuf_splice(sb, pos, len, "", 0);
 }
 
 void strbuf_add(struct strbuf *sb, const void *data, size_t len)