@@ -6675,8 +6675,8 @@ S_regatom(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth)
6675
6675
normal_default:
6676
6676
if (! UTF8_IS_INVARIANT(*p) && UTF) {
6677
6677
STRLEN numlen;
6678
- ender = utf8n_to_uvchr ((U8*)p, RExC_end - p ,
6679
- &numlen, UTF8_ALLOW_DEFAULT );
6678
+ ender = utf8_to_uv_or_die ((U8*) p, (U8*) RExC_end ,
6679
+ &numlen);
6680
6680
p += numlen;
6681
6681
}
6682
6682
else
@@ -9708,9 +9708,8 @@ S_regclass(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth,
9708
9708
non_portable_endpoint = 0;
9709
9709
}
9710
9710
if (UTF && ! UTF8_IS_INVARIANT(* RExC_parse)) {
9711
- value = utf8n_to_uvchr((U8*)RExC_parse,
9712
- RExC_end - RExC_parse,
9713
- &numlen, UTF8_ALLOW_DEFAULT);
9711
+ value = utf8_to_uv_or_die((U8*) RExC_parse, (U8*) RExC_end,
9712
+ &numlen);
9714
9713
RExC_parse_inc_by(numlen);
9715
9714
}
9716
9715
else {
@@ -9772,9 +9771,8 @@ S_regclass(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth,
9772
9771
}
9773
9772
9774
9773
if (UTF && ! UTF8_IS_INVARIANT(UCHARAT(RExC_parse))) {
9775
- value = utf8n_to_uvchr((U8*)RExC_parse,
9776
- RExC_end - RExC_parse,
9777
- &numlen, UTF8_ALLOW_DEFAULT);
9774
+ value = utf8_to_uv_or_die((U8*) RExC_parse, (U8*) RExC_end,
9775
+ &numlen);
9778
9776
RExC_parse_inc_by(numlen);
9779
9777
}
9780
9778
else {
0 commit comments