summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRene Scharfe <l.s.r@web.de>2017-08-30 18:20:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-09-06 23:49:28 (GMT)
commit9a012bf32a3b21648ab96f2bd234a563c22e0ae7 (patch)
tree5dab149f6085881a6a09853d699e2b3a7aac16e2
parent460c7eb2bf5540384dfc18ace59abec6fa3aa009 (diff)
downloadgit-9a012bf32a3b21648ab96f2bd234a563c22e0ae7.zip
git-9a012bf32a3b21648ab96f2bd234a563c22e0ae7.tar.gz
git-9a012bf32a3b21648ab96f2bd234a563c22e0ae7.tar.bz2
utf8: release strbuf on error return in strbuf_utf8_replace()
Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--utf8.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/utf8.c b/utf8.c
index 0c8e011..47a4204 100644
--- a/utf8.c
+++ b/utf8.c
@@ -381,7 +381,7 @@ void strbuf_utf8_replace(struct strbuf *sb_src, int pos, int width,
old = src;
n = utf8_width((const char**)&src, NULL);
if (!src) /* broken utf-8, do nothing */
- return;
+ goto out;
if (n && w >= pos && w < pos + width) {
if (subst) {
memcpy(dst, subst, subst_len);
@@ -397,6 +397,7 @@ void strbuf_utf8_replace(struct strbuf *sb_src, int pos, int width,
}
strbuf_setlen(&sb_dst, dst - sb_dst.buf);
strbuf_swap(sb_src, &sb_dst);
+out:
strbuf_release(&sb_dst);
}