utf8: fix checking for glyph width in `strbuf_utf8_replace()`
commit81c2d4c3a5ba0e6ab8c348708441fed170e63a82
authorPatrick Steinhardt <ps@pks.im>
Thu, 1 Dec 2022 14:47:10 +0000 (1 15:47 +0100)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Dec 2022 05:26:21 +0000 (9 14:26 +0900)
tree6e42dd04e82fdce97983392fca1ca058a74b7e27
parent937b71cc8b5b998963a7f9a33312ba3549d55510
utf8: fix checking for glyph width in `strbuf_utf8_replace()`

In `strbuf_utf8_replace()`, we call `utf8_width()` to compute the width
of the current glyph. If the glyph is a control character though it can
be that `utf8_width()` returns `-1`, but because we assign this value to
a `size_t` the conversion will cause us to underflow. This bug can
easily be triggered with the following command:

    $ git log --pretty='format:xxx%<|(1,trunc)%x10'

>From all I can see though this seems to be a benign underflow that has
no security-related consequences.

Fix the bug by using an `int` instead. When we see a control character,
we now copy it into the target buffer but don't advance the current
width of the string.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t4205-log-pretty-formats.sh
utf8.c