Change 30171 by [EMAIL PROTECTED] on 2007/02/08 13:46:31

        Subject: [PATCH] Re: Change 29193 is a regression
        From: Rick Delaney <[EMAIL PROTECTED]>
        Date: Thu, 8 Feb 2007 08:21:37 -0500
        Message-ID: <[EMAIL PROTECTED]>

Affected files ...

... //depot/perl/pp_ctl.c#600 edit
... //depot/perl/t/op/taint.t#82 edit

Differences ...

==== //depot/perl/pp_ctl.c#600 (text) ====
Index: perl/pp_ctl.c
--- perl/pp_ctl.c#599~30105~    2007-02-03 07:23:52.000000000 -0800
+++ perl/pp_ctl.c       2007-02-08 05:46:31.000000000 -0800
@@ -3444,6 +3444,7 @@
     }
     sv = POPs;
 
+    TAINT_IF(SvTAINTED(sv));
     TAINT_PROPER("eval");
 
     ENTER;

==== //depot/perl/t/op/taint.t#82 (xtext) ====
Index: perl/t/op/taint.t
--- perl/t/op/taint.t#81~30168~ 2007-02-07 15:54:53.000000000 -0800
+++ perl/t/op/taint.t   2007-02-08 05:46:31.000000000 -0800
@@ -1216,7 +1216,6 @@
 }
 
 {
-    local $::TODO = "eval currently ignores tainting";
     my $val = 0;
     my $tainted = '1' . $TAINT;
     eval '$val = eval $tainted;';
@@ -1225,7 +1224,8 @@
 
     # Rather nice code to get a tainted undef by from Rick Delaney
     open FH, "test.pl" or die $!;
-    $tainted=(<FH>,<FH>);
+    seek FH, 0, 2 or die $!;
+    $tainted = <FH>;
 
     eval 'eval $tainted';
     like ($@, qr/^Insecure dependency in eval/);
End of Patch.

Reply via email to