Skip to content

Commit 4308759

Browse files
pcloudsgitster
authored andcommitted
utf8.c: fix strbuf_utf8_replace() consuming data beyond input string
The main loop in strbuf_utf8_replace() could summed up as: while ('src' is still valid) { 1) advance 'src' to copy ANSI escape sequences 2) advance 'src' to copy/replace visible characters } The problem is after #1, 'src' may have reached the end of the string (so 'src' points to NUL) and #2 will continue to copy that NUL as if it's a normal character. Because the output is stored in a strbuf, this NUL accounted in the 'len' field as well. Check after #1 and break the loop if necessary. The test does not look obvious, but the combination of %>>() should make a call trace like this show_log() pretty_print_commit() format_commit_message() strbuf_expand() format_commit_item() format_and_pad_commit() strbuf_utf8_replace() where %C(auto)%d would insert a color reset escape sequence in the end of the string given to strbuf_utf8_replace() and show_log() uses fwrite() to send everything to stdout (including the incorrect NUL inserted by strbuf_utf8_replace) Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 32f5660 commit 4308759

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

t/t4205-log-pretty-formats.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,13 @@ EOF
431431
test_cmp expected actual
432432
'
433433

434+
test_expect_success 'strbuf_utf8_replace() not producing NUL' '
435+
git log --color --pretty="tformat:%<(10,trunc)%s%>>(10,ltrunc)%C(auto)%d" |
436+
test_decode_color |
437+
nul_to_q >actual &&
438+
! grep Q actual
439+
'
440+
434441
# get new digests (with no abbreviations)
435442
head1=$(git rev-parse --verify HEAD~0) &&
436443
head2=$(git rev-parse --verify HEAD~1) &&

utf8.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,9 @@ void strbuf_utf8_replace(struct strbuf *sb_src, int pos, int width,
444444
dst += n;
445445
}
446446

447+
if (src >= end)
448+
break;
449+
447450
old = src;
448451
n = utf8_width((const char**)&src, NULL);
449452
if (!src) /* broken utf-8, do nothing */

0 commit comments

Comments
 (0)