Fix valid_utf8_to_uvchr() for EBCDIC

1 files changed, 6 insertions, 2 deletions

diff --git a/utf8.c b/utf8.c
index e9b0f5cd28..fb3934c2b0 100644
--- a/utf8.c
+++ b/utf8.c
@@ -936,7 +936,7 @@ Perl_valid_utf8_to_uvchr(pTHX_ const U8 *s, STRLEN *retlen)
 {
     UV expectlen = UTF8SKIP(s);
     const U8* send = s + expectlen;
-    UV uv = NATIVE_UTF8_TO_I8(*s);
+    UV uv = *s;
 
     PERL_ARGS_ASSERT_VALID_UTF8_TO_UVCHR;
 
@@ -946,9 +946,13 @@ Perl_valid_utf8_to_uvchr(pTHX_ const U8 *s, STRLEN *retlen)
 
     /* An invariant is trivially returned */
     if (expectlen == 1) {
-        return LATIN1_TO_NATIVE(uv);
+	return uv;
     }
 
+#ifdef EBCDIC
+    uv = NATIVE_UTF8_TO_I8(uv);
+#endif
+
     /* Remove the leading bits that indicate the number of bytes, leaving just
      * the bits that are part of the value */
     uv &= UTF_START_MASK(expectlen);