strbuf: use valid pointer in strbuf_remove()
authorRené Scharfe <l.s.r@web.de>
Tue, 13 Sep 2016 16:40:22 +0000 (18:40 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Sep 2016 23:07:37 +0000 (16:07 -0700)
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>
strbuf.c
index 2c08dbb15381351ede663c1d41ebf3b6838a0c12..e554f1f38c2a49d5a2d7bc42cb9b65745276f08d 100644 (file)
--- 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)