X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=regcomp.c;h=64c06f00273812b9689b376ac1186f1a67ceee18;hb=045453ec55d824e77191d868f07b6aa6ada39395;hp=c6fb7feeb765c2588d813bf8826aa4ad6266323d;hpb=c5be433b5c5658093bc9cae4434721a0b63e7a85;p=p5sagit%2Fp5-mst-13.2.git diff --git a/regcomp.c b/regcomp.c index c6fb7fe..64c06f0 100644 --- a/regcomp.c +++ b/regcomp.c @@ -132,12 +132,33 @@ #define SPSTART 0x4 /* Starts with * or +. */ #define TRYAGAIN 0x8 /* Weeded out a declaration. */ +/* Length of a variant. */ + +typedef struct scan_data_t { + I32 len_min; + I32 len_delta; + I32 pos_min; + I32 pos_delta; + SV *last_found; + I32 last_end; /* min value, <0 unless valid. */ + I32 last_start_min; + I32 last_start_max; + SV **longest; /* Either &l_fixed, or &l_float. */ + SV *longest_fixed; + I32 offset_fixed; + SV *longest_float; + I32 offset_float_min; + I32 offset_float_max; + I32 flags; + I32 whilem_c; +} scan_data_t; + /* * Forward declarations for pregcomp()'s friends. */ static scan_data_t zero_scan_data = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0 }; + 0, 0, 0, 0 }; #define SF_BEFORE_EOL (SF_BEFORE_SEOL|SF_BEFORE_MEOL) #define SF_BEFORE_SEOL 0x1 @@ -171,10 +192,14 @@ static scan_data_t zero_scan_data = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, #define OOB_CHAR8 1234 #define OOB_UTF8 123456 +#define OOB_NAMEDCLASS -1 #define CHR_SVLEN(sv) (UTF ? sv_len_utf8(sv) : SvCUR(sv)) #define CHR_DIST(a,b) (UTF ? utf8_distance(a,b) : a - b) +/* Allow for side effects in s */ +#define REGC(c,s) STMT_START { if (!SIZE_ONLY) *(s) = (c); else (s);} STMT_END + static void clear_re(pTHXo_ void *r); STATIC void @@ -239,7 +264,7 @@ S_study_chunk(pTHX_ regnode **scanp, I32 *deltap, regnode *last, scan_data_t *da regnode *stop = scan; #endif - next = scan + (*OPERAND(scan) + 2 - 1)/sizeof(regnode) + 2; + next = scan + NODE_SZ_STR(scan); /* Skip NOTHING, merge EXACT*. */ while (n && ( PL_regkind[(U8)OP(n)] == NOTHING || @@ -258,17 +283,17 @@ S_study_chunk(pTHX_ regnode **scanp, I32 *deltap, regnode *last, scan_data_t *da n = regnext(n); } else { - int oldl = *OPERAND(scan); + int oldl = STR_LEN(scan); regnode *nnext = regnext(n); - if (oldl + *OPERAND(n) > U8_MAX) + if (oldl + STR_LEN(n) > U8_MAX) break; NEXT_OFF(scan) += NEXT_OFF(n); - *OPERAND(scan) += *OPERAND(n); - next = n + (*OPERAND(n) + 2 - 1)/sizeof(regnode) + 2; + STR_LEN(scan) += STR_LEN(n); + next = n + NODE_SZ_STR(n); /* Now we can overwrite *n : */ - Move(OPERAND(n) + 1, OPERAND(scan) + oldl + 1, - *OPERAND(n) + 1, char); + Move(STRING(n), STRING(scan) + oldl, + STR_LEN(n), char); #ifdef DEBUGGING if (stringok) stop = next - 1; @@ -278,7 +303,7 @@ S_study_chunk(pTHX_ regnode **scanp, I32 *deltap, regnode *last, scan_data_t *da } #ifdef DEBUGGING /* Allow dumping */ - n = scan + (*OPERAND(scan) + 2 - 1)/sizeof(regnode) + 2; + n = scan + NODE_SZ_STR(scan); while (n <= stop) { /* Purify reports a benign UMR here sometimes, because we * don't initialize the OP() slot of a node when that node @@ -328,6 +353,8 @@ S_study_chunk(pTHX_ regnode **scanp, I32 *deltap, regnode *last, scan_data_t *da num++; data_fake.flags = 0; + if (data) + data_fake.whilem_c = data->whilem_c; next = regnext(scan); scan = NEXTOPER(scan); if (code != BRANCH) @@ -346,6 +373,8 @@ S_study_chunk(pTHX_ regnode **scanp, I32 *deltap, regnode *last, scan_data_t *da pars++; if (data && (data_fake.flags & SF_HAS_EVAL)) data->flags |= SF_HAS_EVAL; + if (data) + data->whilem_c = data_fake.whilem_c; if (code == SUSPEND) break; } @@ -367,9 +396,9 @@ S_study_chunk(pTHX_ regnode **scanp, I32 *deltap, regnode *last, scan_data_t *da continue; } else if (OP(scan) == EXACT) { - I32 l = *OPERAND(scan); + I32 l = STR_LEN(scan); if (UTF) { - unsigned char *s = (unsigned char *)(OPERAND(scan)+1); + unsigned char *s = (unsigned char *)STRING(scan); unsigned char *e = s + l; I32 newl = 0; while (s < e) { @@ -387,18 +416,18 @@ S_study_chunk(pTHX_ regnode **scanp, I32 *deltap, regnode *last, scan_data_t *da data->last_start_max = is_inf ? I32_MAX : data->pos_min + data->pos_delta; } - sv_catpvn(data->last_found, (char *)(OPERAND(scan)+1), *OPERAND(scan)); + sv_catpvn(data->last_found, STRING(scan), STR_LEN(scan)); data->last_end = data->pos_min + l; data->pos_min += l; /* As in the first entry. */ data->flags &= ~SF_BEFORE_EOL; } } else if (PL_regkind[(U8)OP(scan)] == EXACT) { - I32 l = *OPERAND(scan); + I32 l = STR_LEN(scan); if (flags & SCF_DO_SUBSTR) scan_commit(data); if (UTF) { - unsigned char *s = (unsigned char *)(OPERAND(scan)+1); + unsigned char *s = (unsigned char *)STRING(scan); unsigned char *e = s + l; I32 newl = 0; while (s < e) { @@ -489,7 +518,7 @@ S_study_chunk(pTHX_ regnode **scanp, I32 *deltap, regnode *last, scan_data_t *da nxt = regnext(nxt); if (!strchr((char*)PL_simple,OP(nxt)) && !(PL_regkind[(U8)OP(nxt)] == EXACT - && *OPERAND(nxt) == 1)) + && STR_LEN(nxt) == 1)) goto nogo; nxt2 = nxt; nxt = regnext(nxt); @@ -562,6 +591,16 @@ S_study_chunk(pTHX_ regnode **scanp, I32 *deltap, regnode *last, scan_data_t *da else oscan->flags = 0; } + else if (OP(oscan) == CURLYX && data && ++data->whilem_c < 16) { + /* This stays as CURLYX, and can put the count/of pair. */ + /* Find WHILEM (as in regexec.c) */ + regnode *nxt = oscan + NEXT_OFF(oscan); + + if (OP(PREVOPER(nxt)) == NOTHING) /* LONGJMP */ + nxt += ARG(nxt); + PREVOPER(nxt)->flags = data->whilem_c + | (PL_reg_whilem_seen << 4); /* On WHILEM */ + } if (data && fl & (SF_HAS_PAR|SF_IN_PAR)) pars++; if (flags & SCF_DO_SUBSTR) { @@ -653,6 +692,8 @@ S_study_chunk(pTHX_ regnode **scanp, I32 *deltap, regnode *last, scan_data_t *da regnode *nscan; data_fake.flags = 0; + if (data) + data_fake.whilem_c = data->whilem_c; next = regnext(scan); nscan = NEXTOPER(NEXTOPER(scan)); minnext = study_chunk(&nscan, &deltanext, last, &data_fake, 0); @@ -661,7 +702,11 @@ S_study_chunk(pTHX_ regnode **scanp, I32 *deltap, regnode *last, scan_data_t *da FAIL("variable length lookbehind not implemented"); } else if (minnext > U8_MAX) { +#ifdef UV_IS_QUAD + FAIL2("lookbehind longer than %" PERL_PRIu64 " not implemented", (UV)U8_MAX); +#else FAIL2("lookbehind longer than %d not implemented", U8_MAX); +#endif } scan->flags = minnext; } @@ -669,6 +714,8 @@ S_study_chunk(pTHX_ regnode **scanp, I32 *deltap, regnode *last, scan_data_t *da pars++; if (data && (data_fake.flags & SF_HAS_EVAL)) data->flags |= SF_HAS_EVAL; + if (data) + data->whilem_c = data_fake.whilem_c; } else if (OP(scan) == OPEN) { pars++; @@ -787,6 +834,7 @@ Perl_pregcomp(pTHX_ char *exp, char *xend, PMOP *pm) I32 minlen = 0; I32 sawplus = 0; I32 sawopen = 0; + scan_data_t data; if (exp == NULL) FAIL("NULL regexp argument"); @@ -798,7 +846,7 @@ Perl_pregcomp(pTHX_ char *exp, char *xend, PMOP *pm) PL_regprecomp = savepvn(exp, xend - exp); DEBUG_r(if (!PL_colorset) reginitcolors()); - DEBUG_r(PerlIO_printf(Perl_debug_log, "%sCompiling%s RE `%s%*s%s'\n", + DEBUG_r(PerlIO_printf(Perl_debug_log, "%sCompiling REx%s `%s%*s%s'\n", PL_colors[4],PL_colors[5],PL_colors[0], xend - exp, PL_regprecomp, PL_colors[1])); PL_regflags = pm->op_pmflags; @@ -816,7 +864,8 @@ Perl_pregcomp(pTHX_ char *exp, char *xend, PMOP *pm) PL_regnpar = 1; PL_regsize = 0L; PL_regcode = &PL_regdummy; - regc((U8)REG_MAGIC, (char*)PL_regcode); + PL_reg_whilem_seen = 0; + REGC((U8)REG_MAGIC, (char*)PL_regcode); if (reg(0, &flags) == NULL) { Safefree(PL_regprecomp); PL_regprecomp = Nullch; @@ -830,6 +879,8 @@ Perl_pregcomp(pTHX_ char *exp, char *xend, PMOP *pm) PL_regsize += PL_extralen; else PL_extralen = 0; + if (PL_reg_whilem_seen > 15) + PL_reg_whilem_seen = 15; /* Allocate space and initialize. */ Newc(1001, r, sizeof(regexp) + (unsigned)PL_regsize * sizeof(regnode), @@ -857,7 +908,7 @@ Perl_pregcomp(pTHX_ char *exp, char *xend, PMOP *pm) PL_regcode = r->program; /* Store the count of eval-groups for security checks: */ PL_regcode->next_off = ((PL_seen_evals > U16_MAX) ? U16_MAX : PL_seen_evals); - regc((U8)REG_MAGIC, (char*) PL_regcode++); + REGC((U8)REG_MAGIC, (char*) PL_regcode++); r->data = 0; if (reg(0, &flags) == NULL) return(NULL); @@ -876,12 +927,11 @@ Perl_pregcomp(pTHX_ char *exp, char *xend, PMOP *pm) 3-units-long substrs field. */ Newz(1004, r->substrs, 1, struct reg_substr_data); + StructCopy(&zero_scan_data, &data, scan_data_t); if (OP(scan) != BRANCH) { /* Only one top-level choice. */ - scan_data_t data; I32 fake; STRLEN longest_float_length, longest_fixed_length; - StructCopy(&zero_scan_data, &data, scan_data_t); first = scan; /* Skip introductions and multiplicators >= 1. */ while ((OP(first) == OPEN && (sawopen = 1)) || @@ -1042,7 +1092,7 @@ Perl_pregcomp(pTHX_ char *exp, char *xend, PMOP *pm) DEBUG_r(PerlIO_printf(Perl_debug_log, "\n")); scan = r->program + 1; - minlen = study_chunk(&scan, &fake, scan + PL_regsize, NULL, 0); + minlen = study_chunk(&scan, &fake, scan + PL_regsize, &data, 0); r->check_substr = r->anchored_substr = r->float_substr = Nullsv; } @@ -1520,8 +1570,10 @@ S_regpiece(pTHX_ I32 *flagp) reginsert(CURLY, ret); } else { - PL_regnaughty += 4 + PL_regnaughty; /* compound interest */ - regtail(ret, reg_node(WHILEM)); + regnode *w = reg_node(WHILEM); + + w->flags = 0; + regtail(ret, w); if (!SIZE_ONLY && PL_extralen) { reginsert(LONGJMP,ret); reginsert(NOTHING,ret); @@ -1532,7 +1584,8 @@ S_regpiece(pTHX_ I32 *flagp) NEXT_OFF(ret) = 3; /* Go over NOTHING to LONGJMP. */ regtail(ret, reg_node(NOTHING)); if (SIZE_ONLY) - PL_extralen += 3; + PL_reg_whilem_seen++, PL_extralen += 3; + PL_regnaughty += 4 + PL_regnaughty; /* compound interest */ } ret->flags = 0; @@ -1904,8 +1957,7 @@ tryagain: ret = reg_node(FOLD ? (LOC ? EXACTFL : EXACTF) : EXACT); - s = (char *) OPERAND(ret); - regc(0, s++); /* save spot for len */ + s = STRING(ret); for (len = 0, p = PL_regcomp_parse - 1; len < 127 && p < PL_regxend; len++) @@ -2045,7 +2097,7 @@ tryagain: } else { len++; - regc(ender, s++); + REGC(ender, s++); } break; } @@ -2055,7 +2107,7 @@ tryagain: len += numlen - 1; } else - regc(ender, s++); + REGC(ender, s++); } loopdone: PL_regcomp_parse = p - 1; @@ -2067,14 +2119,11 @@ tryagain: if (len == 1) *flagp |= SIMPLE; if (!SIZE_ONLY) - *OPERAND(ret) = len; - regc('\0', s++); - if (SIZE_ONLY) { - PL_regsize += (len + 2 + sizeof(regnode) - 1) / sizeof(regnode); - } - else { - PL_regcode += (len + 2 + sizeof(regnode) - 1) / sizeof(regnode); - } + STR_LEN(ret) = len; + if (SIZE_ONLY) + PL_regsize += STR_SZ(len); + else + PL_regcode += STR_SZ(len); } break; } @@ -2198,7 +2247,7 @@ S_regpposixcc(pTHX_ I32 value) } break; } - if ((namedclass == -1 || + if ((namedclass == OOB_NAMEDCLASS || !(posixcc + skip + 2 < PL_regxend && (posixcc[skip] == ':' && posixcc[skip + 1] == ']')))) @@ -2227,7 +2276,7 @@ S_checkposixcc(pTHX) *PL_regcomp_parse == '=' || *PL_regcomp_parse == '.')) { char *s = PL_regcomp_parse; - char c = *s++; + char c = *s++; while(*s && isALNUM(*s)) s++; @@ -2254,10 +2303,10 @@ S_regclass(pTHX) I32 numlen; I32 namedclass; - s = opnd = (char *) OPERAND(PL_regcode); + s = opnd = MASK(PL_regcode); ret = reg_node(ANYOF); for (value = 0; value < ANYOF_SIZE; value++) - regc(0, s++); + REGC(0, s++); if (*PL_regcomp_parse == '^') { /* Complement of range. */ PL_regnaughty++; PL_regcomp_parse++; @@ -2281,7 +2330,7 @@ S_regclass(pTHX) goto skipcond; /* allow 1st char to be ] or - */ while (PL_regcomp_parse < PL_regxend && *PL_regcomp_parse != ']') { skipcond: - namedclass = -1; + namedclass = OOB_NAMEDCLASS; value = UCHARAT(PL_regcomp_parse++); if (value == '[') namedclass = regpposixcc(value); @@ -2316,7 +2365,9 @@ S_regclass(pTHX) break; } } - if (!SIZE_ONLY && namedclass > -1) { + if (!SIZE_ONLY && namedclass > OOB_NAMEDCLASS) { + if (range) + FAIL("invalid [] range in regexp"); /* [a-\w], [a-[:word:]] */ switch (namedclass) { case ANYOF_ALNUM: if (LOC) @@ -2557,25 +2608,27 @@ S_regclass(pTHX) } if (LOC) ANYOF_FLAGS(opnd) |= ANYOF_CLASS; - lastvalue = OOB_CHAR8; + continue; } - else if (range) { if (lastvalue > value) - FAIL("invalid [] range in regexp"); + FAIL("invalid [] range in regexp"); /* [b-a] */ range = 0; } else { lastvalue = value; if (*PL_regcomp_parse == '-' && PL_regcomp_parse+1 < PL_regxend && - PL_regcomp_parse[1] != ']') { + PL_regcomp_parse[1] != ']') { + if (namedclass > OOB_NAMEDCLASS) + FAIL("invalid [] range in regexp"); /* [\w-a] */ PL_regcomp_parse++; range = 1; continue; /* do it next time */ } } + /* now is the next time */ if (!SIZE_ONLY) { -#ifndef ASCIIish +#ifndef ASCIIish /* EBCDIC, for example. */ if ((isLOWER(lastvalue) && isLOWER(value)) || (isUPPER(lastvalue) && isUPPER(value))) { @@ -2595,7 +2648,7 @@ S_regclass(pTHX) for ( ; lastvalue <= value; lastvalue++) ANYOF_BITMAP_SET(opnd, lastvalue); } - lastvalue = value; + range = 0; } /* optimize case-insensitive simple patterns (e.g. /[a-z]/i) */ if (!SIZE_ONLY && @@ -2653,7 +2706,7 @@ S_regclassutf8(pTHX) while (PL_regcomp_parse < PL_regxend && *PL_regcomp_parse != ']') { skipcond: - namedclass = -1; + namedclass = OOB_NAMEDCLASS; value = utf8_to_uv((U8*)PL_regcomp_parse, &numlen); PL_regcomp_parse += numlen; @@ -2725,7 +2778,9 @@ S_regclassutf8(pTHX) break; } } - if (!SIZE_ONLY && namedclass > -1) { + if (!SIZE_ONLY && namedclass > OOB_NAMEDCLASS) { + if (range) + FAIL("invalid [] range in regexp"); /* [a-\w], [a-[:word:]] */ switch (namedclass) { case ANYOF_ALNUM: Perl_sv_catpvf(aTHX_ listsv, "+utf8::IsWord\n"); break; @@ -2780,27 +2835,40 @@ S_regclassutf8(pTHX) case ANYOF_NXDIGIT: Perl_sv_catpvf(aTHX_ listsv, "!utf8::IsXDigit\n"); break; } + continue; } - else if (range) { if (lastvalue > value) - FAIL("invalid [] range in regexp"); + FAIL("invalid [] range in regexp"); /* [b-a] */ +#ifdef UV_IS_QUAD if (!SIZE_ONLY) - Perl_sv_catpvf(aTHX_ listsv, "%04x\t%04x\n", lastvalue, value); - lastvalue = value; + Perl_sv_catpvf(aTHX_ listsv, "%04" PERL_PRIx64 "\t%04" PERL_PRIx64 "\n", (UV)lastvalue, (UV)value); +#else + if (!SIZE_ONLY) + Perl_sv_catpvf(aTHX_ listsv, "%04x\t%04x\n", lastvalue, value); +#endif range = 0; } else { lastvalue = value; if (*PL_regcomp_parse == '-' && PL_regcomp_parse+1 < PL_regxend && - PL_regcomp_parse[1] != ']') { + PL_regcomp_parse[1] != ']') { + if (namedclass > OOB_NAMEDCLASS) + FAIL("invalid [] range in regexp"); /* [\w-a] */ PL_regcomp_parse++; range = 1; continue; /* do it next time */ } - if (!SIZE_ONLY) - Perl_sv_catpvf(aTHX_ listsv, "%04x\n", value); } + /* now is the next time */ +#ifdef UV_IS_QUAD + if (!SIZE_ONLY) + Perl_sv_catpvf(aTHX_ listsv, "%04" PERL_PRIx64 "\n", (UV)value); +#else + if (!SIZE_ONLY) + Perl_sv_catpvf(aTHX_ listsv, "%04x\n", value); +#endif + range = 0; } ret = reganode(ANYOFUTF8, 0); @@ -2898,7 +2966,7 @@ S_reganode(pTHX_ U8 op, U32 arg) } /* -- regc - emit (if appropriate) a Unicode character +- reguni - emit (if appropriate) a Unicode character */ STATIC void S_reguni(pTHX_ UV uv, char* s, I32* lenp) @@ -2914,17 +2982,6 @@ S_reguni(pTHX_ UV uv, char* s, I32* lenp) } /* -- regc - emit (if appropriate) a byte of code -*/ -STATIC void -S_regc(pTHX_ U8 b, char* s) -{ - dTHR; - if (!SIZE_ONLY) - *s = b; -} - -/* - reginsert - insert an operator in front of already-emitted operand * * Means relocating the operand. @@ -3085,7 +3142,7 @@ S_dumpuntil(pTHX_ regnode *start, regnode *node, regnode *last, SV* sv, I32 l) } else if (PL_regkind[(U8)op] == EXACT) { /* Literal string, where present. */ - node += ((*OPERAND(node)) + 2 + sizeof(regnode) - 1) / sizeof(regnode); + node += NODE_SZ_STR(node) - 1; node = NEXTOPER(node); } else { @@ -3115,16 +3172,18 @@ Perl_regdump(pTHX_ regexp *r) /* Header fields of interest. */ if (r->anchored_substr) - PerlIO_printf(Perl_debug_log, "anchored `%s%s%s'%s at %d ", + PerlIO_printf(Perl_debug_log, "anchored `%s%.*s%s'%s at %d ", PL_colors[0], + SvCUR(r->anchored_substr) - (SvTAIL(r->anchored_substr)!=0), SvPVX(r->anchored_substr), PL_colors[1], SvTAIL(r->anchored_substr) ? "$" : "", r->anchored_offset); if (r->float_substr) - PerlIO_printf(Perl_debug_log, "floating `%s%s%s'%s at %d..%u ", + PerlIO_printf(Perl_debug_log, "floating `%s%.*s%s'%s at %d..%u ", PL_colors[0], - SvPVX(r->float_substr), + SvCUR(r->float_substr) - (SvTAIL(r->float_substr)!=0), + SvPVX(r->float_substr), PL_colors[1], SvTAIL(r->float_substr) ? "$" : "", r->float_min_offset, r->float_max_offset); @@ -3186,16 +3245,19 @@ Perl_regprop(pTHX_ SV *sv, regnode *o) k = PL_regkind[(U8)OP(o)]; if (k == EXACT) - Perl_sv_catpvf(aTHX_ sv, " <%s%s%s>", PL_colors[0], OPERAND(o) + 1, PL_colors[1]); + Perl_sv_catpvf(aTHX_ sv, " <%s%.*s%s>", PL_colors[0], + STR_LEN(o), STRING(o), PL_colors[1]); else if (k == CURLY) { if (OP(o) == CURLYM || OP(o) == CURLYN) Perl_sv_catpvf(aTHX_ sv, "[%d]", o->flags); /* Parenth number */ Perl_sv_catpvf(aTHX_ sv, " {%d,%d}", ARG1(o), ARG2(o)); } + else if (k == WHILEM && o->flags) /* Ordinal/of */ + Perl_sv_catpvf(aTHX_ sv, "[%d/%d]", o->flags & 0xf, o->flags>>4); else if (k == REF || k == OPEN || k == CLOSE || k == GROUPP ) Perl_sv_catpvf(aTHX_ sv, "%d", ARG(o)); /* Parenth number */ else if (k == LOGICAL) - Perl_sv_catpvf(aTHX_ sv, "[%d]", ARG(o)); /* 2: embedded, otherwise 1 */ + Perl_sv_catpvf(aTHX_ sv, "[%d]", o->flags); /* 2: embedded, otherwise 1 */ else if (k == BRANCHJ && (OP(o) == UNLESSM || OP(o) == IFMATCH)) Perl_sv_catpvf(aTHX_ sv, "[-%d]", o->flags); #endif /* DEBUGGING */ @@ -3224,6 +3286,10 @@ void Perl_pregfree(pTHX_ struct regexp *r) { dTHR; + DEBUG_r(if (!PL_colorset) reginitcolors()); + + if (!r || (--r->refcnt > 0)) + return; DEBUG_r(PerlIO_printf(Perl_debug_log, "%sFreeing REx:%s `%s%.60s%s%s'\n", PL_colors[4],PL_colors[5],PL_colors[0], @@ -3231,9 +3297,6 @@ Perl_pregfree(pTHX_ struct regexp *r) PL_colors[1], (strlen(r->precomp) > 60 ? "..." : ""))); - - if (!r || (--r->refcnt > 0)) - return; if (r->precomp) Safefree(r->precomp); if (RX_MATCH_COPIED(r)) @@ -3332,7 +3395,7 @@ S_re_croak2(pTHX_ const char* pat1,const char* pat2,...) #else va_start(args); #endif - msv = mess(buf, &args); + msv = vmess(buf, &args); va_end(args); message = SvPV(msv,l1); if (l1 > 512)