diff options
| author | Hugo van der Sanden <hv@crypt.org> | 1998-07-01 22:14:05 +0200 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1998-07-04 05:06:52 +0000 |
| commit | ef64f398041e39403718b830b0e15752f4a1cfbf (patch) | |
| tree | edae921f2c92546db97eaed67cedba0012d6d7fd | |
| parent | a45b45bb1348651ebb0ab7ec1221fce2376aa4a1 (diff) | |
| download | perl-ef64f398041e39403718b830b0e15752f4a1cfbf.tar.gz | |
catch nonexistent backrefs in REs
Message-Id: <l03130304b1c027e1df9e@[194.222.64.89]>
Date: Wed, 1 Jul 1998 20:14:05 +0200
Subject: Re: [PATCH _66] for bad backrefs
--
Message-Id: <l03130300b1c03425261c@[194.222.64.89]>
Date: Wed, 1 Jul 1998 20:47:16 +0200
Subject: Re: [PATCH _66] for bad backrefs
p4raw-id: //depot/perl@1293
| -rw-r--r-- | regcomp.c | 4 | ||||
| -rw-r--r-- | t/op/re_tests | 10 | ||||
| -rw-r--r-- | util.c | 4 |
3 files changed, 15 insertions, 3 deletions
@@ -765,6 +765,7 @@ pregcomp(char *exp, char *xend, PMOP *pm) r->prelen = xend - exp; r->precomp = regprecomp; r->subbeg = r->subbase = NULL; + r->nparens = regnpar - 1; /* set early to validate backrefs */ regcomp_rx = r; /* Second pass: emit code. */ @@ -936,7 +937,6 @@ pregcomp(char *exp, char *xend, PMOP *pm) r->check_substr = r->anchored_substr = r->float_substr = Nullsv; } - r->nparens = regnpar - 1; r->minlen = minlen; if (regseen & REG_SEEN_GPOS) r->reganch |= ROPT_GPOS_SEEN; @@ -1609,6 +1609,8 @@ tryagain: if (num > 9 && num >= regnpar) goto defchar; else { + if (!SIZE_ONLY && num > regcomp_rx->nparens) + FAIL("reference to nonexistent group"); regsawback = 1; ret = reganode((regflags & PMf_FOLD) ? ((regflags & PMf_LOCALE) ? REFFL : REFF) diff --git a/t/op/re_tests b/t/op/re_tests index dd54a2a5b5..78d89be11c 100644 --- a/t/op/re_tests +++ b/t/op/re_tests @@ -164,6 +164,16 @@ a(bc)d abcd y $1-\$1-\\$1 bc-$1-\bc a[-]?c ac y $& ac (abc)\1 abcabc y $1 abc ([a-c]*)\1 abcabc y $1 abc +\1 - c - /\1/: reference to nonexistent group +\2 - c - /\2/: reference to nonexistent group +(a)|\1 a y - - +(a)|\1 x n - - +(a)|\2 - c - /(a)|\2/: reference to nonexistent group +(([a-c])b*?\2)* ababbbcbc y $&-$1-$2 ababb-bb-b +(([a-c])b*?\2){3} ababbbcbc y $&-$1-$2 ababbbcbc-cbc-c +((\3|b)\2(a)x)+ aaxabxbaxbbx n - - +((\3|b)\2(a)x)+ aaaxabaxbaaxbbax y $&-$1-$2-$3 bbax-bbax-b-a +((\3|b)\2(a)){2,} bbaababbabaaaaabbaaaabba y $&-$1-$2-$3 bbaaaabba-bba-b-a 'abc'i ABC y $& ABC 'abc'i XBC n - - 'abc'i AXC n - - @@ -1091,7 +1091,7 @@ screaminstr(SV *bigstr, SV *littlestr, I32 start_shift, I32 end_shift, I32 *old_ } #ifdef POINTERRIGOR do { - if (pos >= stop_pos) return Nullch; + if (pos >= stop_pos) break; if (big[pos-previous] != first) continue; for (x=big+pos+1-previous,s=little; s < littleend; /**/ ) { @@ -1110,7 +1110,7 @@ screaminstr(SV *bigstr, SV *littlestr, I32 start_shift, I32 end_shift, I32 *old_ #else /* !POINTERRIGOR */ big -= previous; do { - if (pos >= stop_pos) return Nullch; + if (pos >= stop_pos) break; if (big[pos] != first) continue; for (x=big+pos+1,s=little; s < littleend; /**/ ) { |