diff options
| author | Patrick Steinhardt <ps@pks.im> | 2022-12-01 15:47:00 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-12-09 06:26:21 +0100 |
| commit | 17d23e8a3812a5ca3dd6564e74d5250f22e5d76d (patch) | |
| tree | ba8f2c2fe6a210bc7e839884f472c6ace93bf1d0 /t/t4205-log-pretty-formats.sh | |
| parent | utf8: fix truncated string lengths in `utf8_strnwidth()` (diff) | |
| download | git-17d23e8a3812a5ca3dd6564e74d5250f22e5d76d.tar.xz git-17d23e8a3812a5ca3dd6564e74d5250f22e5d76d.zip | |
utf8: fix returning negative string width
The `utf8_strnwidth()` function calls `utf8_width()` in a loop and adds
its returned width to the end result. `utf8_width()` can return `-1`
though in case it reads a control character, which means that the
computed string width is going to be wrong. In the worst case where
there are more control characters than non-control characters, we may
even return a negative string width.
Fix this bug by treating control characters as having zero width.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4205-log-pretty-formats.sh')
| -rwxr-xr-x | t/t4205-log-pretty-formats.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh index c88b64d08b..e3905baa3c 100755 --- a/t/t4205-log-pretty-formats.sh +++ b/t/t4205-log-pretty-formats.sh @@ -899,6 +899,12 @@ test_expect_success SIZE_T_IS_64BIT 'log --pretty with overflowing wrapping dire test_cmp expect error ' +test_expect_success 'log --pretty with padding and preceding control chars' ' + printf "\20\20 0" >expect && + git log -1 --pretty="format:%x10%x10%>|(4)%x30" >actual && + test_cmp expect actual +' + test_expect_success EXPENSIVE,SIZE_T_IS_64BIT 'log --pretty with huge commit message' ' # We only assert that this command does not crash. This needs to be # executed with the address sanitizer to demonstrate failure. |