vitalif
/
bugzilla-4intranet
mirror of https://github.com/vitalif/bugzilla-4intranet
1
0
Fork 0
Code Issues Releases Wiki Activity

Correctly detect IN_EVAL under HTTPServerSimple, fix preload under taint mode

classes
Vitaliy Filippov 2015-11-05 13:51:28 +03:00
parent 58346deb00
commit 3e4cd49b2c
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bugzilla/Error.pm
View File

@ -34,7 +34,7 @@ sub _in_eval
my $in = -$IN_EVAL;
for (my $stack = 1; my $sub = (caller($stack))[3]; $stack++)
{
$in--, last if $sub =~ /^Bugzilla::HTTPServerSimple/;
last if $sub =~ /^Bugzilla::HTTPServerSimple/;
last if $sub =~ /^ModPerl/;
if ($sub =~ /^\(eval\)/)
{

3
HTTPServerSimple.pl
View File

@ -120,6 +120,7 @@ sub new
{
for (glob $script)
{
($_) = /^(.*)$/so;
eval
{
$self->load_script($_);
@ -252,6 +253,7 @@ sub run_script
my ($script) = @_;
$self->load_script($script);
my $start = [gettimeofday];
$Bugzilla::Error::IN_EVAL++;
$in_eval = 1;
eval { &{$subs{$script}}(); };
$self->check_errors($script);
@ -289,6 +291,7 @@ sub check_errors
print STDERR "Error in _cleanup():\n$@";
}
$in_eval = 0;
$Bugzilla::Error::IN_EVAL--;
if ($err)
{
$self->internal_error($err);