diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 1998-07-05 00:35:27 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1998-07-05 00:35:27 +0000 |
| commit | 7231175158f8ebe4d4c89fd774d89f1e9de28649 (patch) | |
| tree | e9c567a660a223412ed950e0091d88e611b75cf0 /pp_ctl.c | |
| parent | 1116284222923a1670dbbe2205884d0616c81dfc (diff) | |
| download | perl-7231175158f8ebe4d4c89fd774d89f1e9de28649.tar.gz | |
patchlevel up to 5.004_70, various tweaks
* fix taint problems due to maintbranch regression
* PERL_OBJECT now builds again
* deal with C++ strong-typing problems in hv.c
* fix mismatch in "reserved word" diagnostic
p4raw-id: //depot/perl@1311
Diffstat (limited to 'pp_ctl.c')
| -rw-r--r-- | pp_ctl.c | 19 |
1 files changed, 9 insertions, 10 deletions
@@ -90,15 +90,6 @@ PP(pp_regcomp) else { t = SvPV(tmpstr, len); -#ifndef INCOMPLETE_TAINTS - if (tainting) { - if (tainted) - pm->op_pmdynflags |= PMdf_TAINTED; - else - pm->op_pmdynflags &= ~PMdf_TAINTED; - } -#endif - /* Check against the last compiled regexp. */ if (!pm->op_pmregexp || !pm->op_pmregexp->precomp || pm->op_pmregexp->prelen != len || @@ -114,6 +105,15 @@ PP(pp_regcomp) } } +#ifndef INCOMPLETE_TAINTS + if (tainting) { + if (tainted) + pm->op_pmdynflags |= PMdf_TAINTED; + else + pm->op_pmdynflags &= ~PMdf_TAINTED; + } +#endif + if (!pm->op_pmregexp->prelen && curpm) pm = curpm; else if (strEQ("\\s+", pm->op_pmregexp->precomp)) @@ -155,7 +155,6 @@ PP(pp_substcont) SV *targ = cx->sb_targ; sv_catpvn(dstr, s, cx->sb_strend - s); - TAINT_IF(cx->sb_rxtainted || RX_MATCH_TAINTED(rx)); cx->sb_rxtainted |= RX_MATCH_TAINTED(rx); (void)SvOOK_off(targ); |