commit d78d582eaa99f63feccb08cf92399d921106867a
parent 6d5c2b3ddbe7d68ccf8293e472c83b2a5fe13b48
Author: Bakkeby <bakkeby@gmail.com>
Date: Thu, 7 Mar 2024 23:22:02 +0100
Streamline validation in utf8decode()
https://lists.suckless.org/hackers/2207/18407.html
Diffstat:
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/st.c b/st.c
@@ -313,8 +313,8 @@ utf8decode(const char *c, Rune *u, size_t clen)
}
if (j < len)
return 0;
- *u = udecoded;
- utf8validate(u, len);
+ *u = (!BETWEEN(udecoded, utfmin[len], utfmax[len]) || BETWEEN(udecoded, 0xD800, 0xDFFF))
+ ? UTF_INVALID : udecoded;
return len;
}