diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2023-07-23 18:10:57 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2023-07-23 18:10:57 +0000 |
| commit | 57d8f745543f7160efb2e4e4fad702768eaa9906 (patch) | |
| tree | d72ba2461ea90f9e220c3ab7556d573d58bfbfa5 /vt.c | |
| parent | changelog: add new ‘unreleased’ section (diff) | |
| parent | changelog: ignore invalid UTF-8 in input (diff) | |
Merge branch 'invalid-utf8'
Closes #1423
Diffstat (limited to 'vt.c')
| -rw-r--r-- | vt.c | 21 |
1 files changed, 21 insertions, 0 deletions
@@ -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 don’t try to + detect, as they’ll 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 don’t try to + detect, as they’ll still decode to valid UTF-32. */ + action_utf8_print(term, term->vt.utf8); } |
