regcomp.c: Change char used to force reading in fold swashes

[perl5.git] / regcomp.c

diff --git a/regcomp.c b/regcomp.c
index d7cb993..1d1bf27 100644 (file)
--- a/regcomp.c
+++ b/regcomp.c
@@ -4523,7 +4523,7 @@ Perl_re_compile(pTHX_ SV * const pattern, U32 orig_pm_flags)
     struct regexp *r;
     register regexp_internal *ri;
     STRLEN plen;
     struct regexp *r;
     register regexp_internal *ri;
     STRLEN plen;

-    char  *exp;
+    VOL char  *exp;

     char* xend;
     regnode *scan;
     I32 flags;
     char* xend;
     regnode *scan;
     I32 flags;


@@ -10454,7 +10454,11 @@ parseit:
                if (! PL_utf8_tofold) {
                    U8 dummy[UTF8_MAXBYTES+1];
                    STRLEN dummy_len;
                if (! PL_utf8_tofold) {
                    U8 dummy[UTF8_MAXBYTES+1];
                    STRLEN dummy_len;

-                   to_utf8_fold((U8*) "A", dummy, &dummy_len);
+
+                   /* This particular string is above \xff in both UTF-8 and
+                    * UTFEBCDIC */
+                   to_utf8_fold((U8*) "\xC8\x80", dummy, &dummy_len);
+                   assert(PL_utf8_tofold); /* Verify that worked */

                }
                PL_utf8_foldclosures = _swash_inversion_hash(PL_utf8_tofold);
            }
                }
                PL_utf8_foldclosures = _swash_inversion_hash(PL_utf8_tofold);
            }