Re: Bug in Carp::Heavy/5.6.0?

[p5sagit/p5-mst-13.2.git] / regcomp.c

diff --git a/regcomp.c b/regcomp.c
index 3f2b10c..19b8096 100644 (file)
--- a/regcomp.c
+++ b/regcomp.c
@@ -843,8 +843,8 @@ S_study_chunk(pTHX_ regnode **scanp, I32 *deltap, regnode *last, scan_data_t *da
            flags &= ~SCF_DO_STCLASS;
        }
        else if (strchr((char*)PL_varies,OP(scan))) {
-           I32 mincount, maxcount, minnext, deltanext, pos_before, fl;
-           I32 f = flags;
+           I32 mincount, maxcount, minnext, deltanext, fl;
+           I32 f = flags, pos_before = 0;
            regnode *oscan = scan;
            struct regnode_charclass_class this_class;
            struct regnode_charclass_class *oclass = NULL;
@@ -2884,7 +2884,7 @@ tryagain:
                default:
                  normal_default:
                    if ((*p & 0xc0) == 0xc0 && UTF) {
-                       ender = utf8_to_uv_chk((U8*)p, PL_regxend - p,
+                       ender = utf8_to_uv((U8*)p, PL_regxend - p,
                                               &numlen, 0);
                        p += numlen;
                    }
@@ -3639,14 +3639,14 @@ S_regclassutf8(pTHX)
        namedclass = OOB_NAMEDCLASS;
        if (!range)
            rangebegin = PL_regcomp_parse;
-       value = utf8_to_uv_chk((U8*)PL_regcomp_parse,
+       value = utf8_to_uv((U8*)PL_regcomp_parse,
                               PL_regxend - PL_regcomp_parse,
                               &numlen, 0);
        PL_regcomp_parse += numlen;
        if (value == '[')
            namedclass = regpposixcc(value);
        else if (value == '\\') {
-           value = (U32)utf8_to_uv_chk((U8*)PL_regcomp_parse,
+           value = (U32)utf8_to_uv((U8*)PL_regcomp_parse,
                                        PL_regxend - PL_regcomp_parse,
                                        &numlen, 0);
            PL_regcomp_parse += numlen;