diff options
| -rwxr-xr-x | t/op/taint.t | 14 | ||||
| -rw-r--r-- | taint.c | 11 |
2 files changed, 21 insertions, 4 deletions
diff --git a/t/op/taint.t b/t/op/taint.t index e6e1265466..557b15f20c 100755 --- a/t/op/taint.t +++ b/t/op/taint.t @@ -124,7 +124,7 @@ my $echo = "$Invoke_Perl $ECHO"; my $TEST = catfile(curdir(), 'TEST'); -print "1..206\n"; +print "1..208\n"; # First, let's make sure that Perl is checking the dangerous # environment variables. Maybe they aren't set yet, so we'll @@ -982,3 +982,15 @@ else $TAINT =~ /(.*)/; test 206, tainted(my $foo = $1); } + +{ + # test with a non-magical %ENV (and non-magical %ENV elements) + our %nonmagicalenv = ( PATH => $TAINT ); + local *ENV = \%nonmagicalenv; + eval { system("lskdfj"); }; + test 207, $@ =~ /Insecure \$ENV{PATH} while running with -T switch/; + # [perl #24291] this used to dump core + %nonmagicalenv = ( PATH => "util" ); + eval { system("lskdfj"); }; + test 208, 1; +} @@ -80,7 +80,8 @@ Perl_taint_env(pTHX) NULL }; - if (!PL_envgv) + /* Don't bother if there's no %ENV hash */ + if (!PL_envgv || !GvHV(PL_envgv)) return; #ifdef VMS @@ -98,7 +99,9 @@ Perl_taint_env(pTHX) TAINT; taint_proper("Insecure %s%s", "$ENV{DCL$PATH}"); } - if ((mg = mg_find(*svp, PERL_MAGIC_envelem)) && MgTAINTEDDIR(mg)) { + if (SvMAGICAL(*svp) + && (mg = mg_find(*svp, PERL_MAGIC_envelem)) + && MgTAINTEDDIR(mg)) { TAINT; taint_proper("Insecure directory in %s%s", "$ENV{DCL$PATH}"); } @@ -113,7 +116,9 @@ Perl_taint_env(pTHX) TAINT; taint_proper("Insecure %s%s", "$ENV{PATH}"); } - if ((mg = mg_find(*svp, PERL_MAGIC_envelem)) && MgTAINTEDDIR(mg)) { + if (SvMAGICAL(*svp) + && (mg = mg_find(*svp, PERL_MAGIC_envelem)) + && MgTAINTEDDIR(mg)) { TAINT; taint_proper("Insecure directory in %s%s", "$ENV{PATH}"); } |