Streamline validation in utf8decode()

https://lists.suckless.org/hackers/2207/18407.html
2024-03-07 23:22:02 +01:00 · 2024-03-07 23:22:02 +01:00 · d78d582eaa
commit d78d582eaa
parent 6d5c2b3ddb
1 changed files with 2 additions and 2 deletions
--- 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;
 }