Commit 024428c195 for perl
commit 024428c195dba36788ef5e4979253eba6efb3d0f
Author: Karl Williamson <khw@cpan.org>
Date: Tue Nov 10 04:49:35 2026 -0700
mathoms: Harden utf8_to_uvuni()
Since we can't remove this function now due to it having cpan uses,
harden it to do more input error checking.
diff --git a/mathoms.c b/mathoms.c
index 45c20b0919..79eea80dcc 100644
--- a/mathoms.c
+++ b/mathoms.c
@@ -145,7 +145,19 @@ Perl_utf8_to_uvuni(pTHX_ const U8 *s, STRLEN *retlen)
{
PERL_ARGS_ASSERT_UTF8_TO_UVUNI;
- return NATIVE_TO_UNI(valid_utf8_to_uv(s, retlen));
+ STRLEN char_len = UTF8_SKIP(s);
+
+ /* Don't read beyond an unexpected NUL */
+ if (char_len > UTF8_CHK_SKIP(s)) {
+ return UNICODE_REPLACEMENT;
+ }
+
+ UV cp;
+ if (! utf8_to_uv(s, s + char_len, &cp, retlen)) {
+ return UNICODE_REPLACEMENT;
+ }
+
+ return NATIVE_TO_UNI(cp);
}
U8 *