vt: detect and ignore invalid UTF-8 sequences

This patch detects invalid codepoints in the UTF-8 EDxxxx range, and
the F4xxxxxx range.

Note that we still allow the E0xxxx and F0xxxxxx ranges. These
contains overlong encodings. We allow them, because they still decode
into correct UTF-32.

Closes #1423
This commit is contained in:
Daniel Eklöf 2023-07-22 11:21:41 +02:00
parent fc973a3bb9
commit b59fd7c388
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F

21
vt.c
View file

@ -913,6 +913,16 @@ action_utf8_33(struct terminal *term, uint8_t c)
{
// wc = ((utf8[0] & 0xf) << 12) | ((utf8[1] & 0x3f) << 6) | (utf8[2] & 0x3f)
term->vt.utf8 |= c & 0x3f;
const char32_t utf32 = term->vt.utf8;
if (unlikely(utf32 >= 0xd800 && utf32 <= 0xdfff)) {
/* Invalid sequence - invalid UTF-16 surrogate halves */
return;
}
/* Note: the E0 range contains overlong encodings. We dont try to
detect, as theyll still decode to valid UTF-32. */
action_utf8_print(term, term->vt.utf8);
}
@ -942,6 +952,17 @@ action_utf8_44(struct terminal *term, uint8_t c)
{
// wc = ((utf8[0] & 7) << 18) | ((utf8[1] & 0x3f) << 12) | ((utf8[2] & 0x3f) << 6) | (utf8[3] & 0x3f);
term->vt.utf8 |= c & 0x3f;
const char32_t utf32 = term->vt.utf8;
if (unlikely(utf32 > 0x10FFFF)) {
/* Invalid UTF-8 */
return;
}
/* Note: the F0 range contains overlong encodings. We dont try to
detect, as theyll still decode to valid UTF-32. */
action_utf8_print(term, term->vt.utf8);
}