strbuf: use valid pointer in strbuf_remove()

rscharfe · gitster · commit a8342a417e48 · 2016-09-13T16:07:37.000-07:00
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 &lt;l.s.r@web.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ void strbuf_insert(struct strbuf sb, size_t pos, const void data, size_t len)`
`187`	`187`
`188`	`188`	`void strbuf_remove(struct strbuf *sb, size_t pos, size_t len)`
`189`	`189`	`{`
`190`		`- strbuf_splice(sb, pos, len, NULL, 0);`
	`190`	`+ strbuf_splice(sb, pos, len, "", 0);`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`void strbuf_add(struct strbuf sb, const void data, size_t len)`