From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Fri, 28 Jun 2002 13:02:01 +0000 (+0000)
Subject: (retracted by #17467)
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=d041010ff66d9b5d3b85efa7fc10fc3b0e425474;p=p5sagit%2Fp5-mst-13.2.git

(retracted by #17467)
EBCDIC-safer.

p4raw-id: //depot/perl@17375
---

diff --git a/regexec.c b/regexec.c
index 389fa1d..793201c 100644
--- a/regexec.c
+++ b/regexec.c
@@ -4329,12 +4329,13 @@ 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 = 0;
+    STRLEN len = 1;
     STRLEN plen;
 
-    if (do_utf8 && !UTF8_IS_INVARIANT(c))
-	 c = utf8n_to_uvchr(p, UTF8_MAXLEN, &len,
-			    ckWARN(WARN_UTF8) ? 0 : UTF8_ALLOW_ANY);
+    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);
 
     plen = lenp ? *lenp : UNISKIP(NATIVE_TO_UNI(c));
     if (do_utf8 || (flags & ANYOF_UNICODE)) {