diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-09-09 12:54:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-09 12:54:02 -0700 |
| commit | 1764e8124e441a84b4764da0f8e6b0c900c44941 (patch) | |
| tree | 392cc5ba3df866f718a08c5aa3e0e5e639dd62af | |
| parent | Merge branch 'sb/plug-leaks' (diff) | |
| parent | utf8.c: fix strbuf_utf8_replace() consuming data beyond input string (diff) | |
| download | tgif-1764e8124e441a84b4764da0f8e6b0c900c44941.tar.xz | |
Merge branch 'nd/strbuf-utf8-replace'
* nd/strbuf-utf8-replace:
utf8.c: fix strbuf_utf8_replace() consuming data beyond input string
| -rwxr-xr-x | t/t4205-log-pretty-formats.sh | 7 | ||||
| -rw-r--r-- | utf8.c | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh index 349c531989..de0cc4a0fd 100755 --- a/t/t4205-log-pretty-formats.sh +++ b/t/t4205-log-pretty-formats.sh @@ -431,6 +431,13 @@ EOF test_cmp expected actual ' +test_expect_success 'strbuf_utf8_replace() not producing NUL' ' + git log --color --pretty="tformat:%<(10,trunc)%s%>>(10,ltrunc)%C(auto)%d" | + test_decode_color | + nul_to_q >actual && + ! grep Q actual +' + # get new digests (with no abbreviations) head1=$(git rev-parse --verify HEAD~0) && head2=$(git rev-parse --verify HEAD~1) && @@ -382,6 +382,9 @@ void strbuf_utf8_replace(struct strbuf *sb_src, int pos, int width, dst += n; } + if (src >= end) + break; + old = src; n = utf8_width((const char**)&src, NULL); if (!src) /* broken utf-8, do nothing */ |