summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-09-21 15:15:25 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-21 15:15:25 -0700
commit3ba0bbb901c6fdb092944bced927a10a1ed25bf5 (patch)
tree9d78fe79b239e3296cc86cff2ce8264849c8bbd4
parentMerge branch 'rs/pack-sort-with-llist-mergesort' (diff)
parentstrbuf: use valid pointer in strbuf_remove() (diff)
downloadtgif-3ba0bbb901c6fdb092944bced927a10a1ed25bf5.tar.xz
Merge branch 'rs/strbuf-remove-fix'
Code cleanup. * rs/strbuf-remove-fix: strbuf: use valid pointer in strbuf_remove()
-rw-r--r--strbuf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/strbuf.c b/strbuf.c
index f3bd5719c6..b839be491b 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)