Retract #17375: contrary to intention, it was actually

harmful on EBCDIC (configpm broke).

p4raw-id: //depot/perl@17467

1 files changed, 4 insertions, 5 deletions

diff --git a/regexec.c b/regexec.c
index bdc05af088..4f403a0443 100644
--- a/regexec.c
+++ b/regexec.c
@@ -4331,13 +4331,12 @@ S_reginclass(pTHX_ register regnode *n, register U8* p, STRLEN* lenp, register b
     char flags = ANYOF_FLAGS(n);
     bool match = FALSE;
     UV c = *p;
-    STRLEN len = 1;
+    STRLEN len = 0;
     STRLEN plen;
 
-    c = (do_utf8 && !UTF8_IS_INVARIANT(c)) ?
-	 utf8n_to_uvchr(p, UTF8_MAXLEN, &len,
-			ckWARN(WARN_UTF8) ? 0 : UTF8_ALLOW_ANY) :
-         NATIVE_TO_UTF(c);
+    if (do_utf8 && !UTF8_IS_INVARIANT(c))
+	 c = utf8n_to_uvchr(p, UTF8_MAXLEN, &len,
+			    ckWARN(WARN_UTF8) ? 0 : UTF8_ALLOW_ANY);
 
     plen = lenp ? *lenp : UNISKIP(NATIVE_TO_UNI(c));
     if (do_utf8 || (flags & ANYOF_UNICODE)) {