Re: Change 29193 is a regression

Message-ID: <20070208132137.GA24202@bort.ca>

p4raw-id: //depot/perl@30171

diff --git a/pp_ctl.c b/pp_ctl.c
index 2edbdd0..ca19ebd 100644 (file)
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -3444,6 +3444,7 @@ PP(pp_entereval)
     }
     sv = POPs;
 
+    TAINT_IF(SvTAINTED(sv));
     TAINT_PROPER("eval");
 
     ENTER;

diff --git a/t/op/taint.t b/t/op/taint.t
index 84600e4..9dd155a 100755 (executable)
--- a/t/op/taint.t
+++ b/t/op/taint.t
@@ -1216,7 +1216,6 @@ SKIP:
 }
 
 {
-    local $::TODO = "eval currently ignores tainting";
     my $val = 0;
     my $tainted = '1' . $TAINT;
     eval '$val = eval $tainted;';
@@ -1225,7 +1224,8 @@ SKIP:
 
     # 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/);