diff options
| author | Rick Delaney <rick@consumercontact.com> | 2002-08-03 20:28:58 -0400 |
|---|---|---|
| committer | hv <hv@crypt.org> | 2002-08-04 15:14:09 +0000 |
| commit | 5a445156505b2b63705ed94cffed69b6c031ee2c (patch) | |
| tree | 60f5651ce5be94283c0dfa5b0e0b1ad831069f38 /pp_sys.c | |
| parent | 20a201fe883b32e8f6ac0c0d014134e32657cb80 (diff) | |
| download | perl-5a445156505b2b63705ed94cffed69b6c031ee2c.tar.gz | |
Re: [PATCH] Re: taint news
Message-ID: <m3heibs0vp.fsf@cs839290-a.mtth.phub.net.cable.rogers.com>
Ref: 20020208.005
p4raw-id: //depot/perl@17676
Diffstat (limited to 'pp_sys.c')
| -rw-r--r-- | pp_sys.c | 28 |
1 files changed, 4 insertions, 24 deletions
@@ -4048,24 +4048,14 @@ PP(pp_system) I32 did_pipes = 0; if (PL_tainting) { - int some_arg_tainted = 0; TAINT_ENV(); while (++MARK <= SP) { (void)SvPV_nolen(*MARK); /* stringify for taint check */ - if (PL_tainted) { - some_arg_tainted = 1; + if (PL_tainted) break; - } } MARK = ORIGMARK; - /* XXX Remove warning at end of deprecation cycle --RD 2002-02 */ - if (SP - MARK == 1) { - TAINT_PROPER("system"); - } - else if (some_arg_tainted && ckWARN2(WARN_TAINT, WARN_DEPRECATED)) { - Perl_warner(aTHX_ packWARN2(WARN_TAINT, WARN_DEPRECATED), - "Use of tainted arguments in %s is deprecated", "system"); - } + TAINT_PROPER("system"); } PERL_FLUSHALL_FOR_CHILD; #if (defined(HAS_FORK) || defined(AMIGAOS)) && !defined(VMS) && !defined(OS2) || defined(PERL_MICRO) @@ -4186,24 +4176,14 @@ PP(pp_exec) STRLEN n_a; if (PL_tainting) { - int some_arg_tainted = 0; TAINT_ENV(); while (++MARK <= SP) { (void)SvPV_nolen(*MARK); /* stringify for taint check */ - if (PL_tainted) { - some_arg_tainted = 1; + if (PL_tainted) break; - } } MARK = ORIGMARK; - /* XXX Remove warning at end of deprecation cycle --RD 2002-02 */ - if (SP - MARK == 1) { - TAINT_PROPER("exec"); - } - else if (some_arg_tainted && ckWARN2(WARN_TAINT, WARN_DEPRECATED)) { - Perl_warner(aTHX_ packWARN2(WARN_TAINT, WARN_DEPRECATED), - "Use of tainted arguments in %s is deprecated", "exec"); - } + TAINT_PROPER("exec"); } PERL_FLUSHALL_FOR_CHILD; if (PL_op->op_flags & OPf_STACKED) { |