diff options
author | Byron Jones <bjones@mozilla.com> | 2012-03-02 08:20:12 +0100 |
---|---|---|
committer | Byron Jones <bjones@mozilla.com> | 2012-03-02 08:20:12 +0100 |
commit | 6efdd49e257759fd68ac0c4689e5b67994f7c330 (patch) | |
tree | 7046fbe1222e745e4bf9526ff41ec8381e4b086d /Bugzilla | |
parent | ed6f8b25f0d83d6c1facb5083425e58a88fac787 (diff) | |
download | bugzilla-6efdd49e257759fd68ac0c4689e5b67994f7c330.tar.gz bugzilla-6efdd49e257759fd68ac0c4689e5b67994f7c330.tar.xz |
Bug 732023: fix perl syntax errors causing infinite loop
Diffstat (limited to 'Bugzilla')
-rw-r--r-- | Bugzilla/Arecibo.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Bugzilla/Arecibo.pm b/Bugzilla/Arecibo.pm index 9e64d3889..54458cca2 100644 --- a/Bugzilla/Arecibo.pm +++ b/Bugzilla/Arecibo.pm @@ -222,6 +222,7 @@ sub _in_eval { my $in_eval = 0; for (my $stack = 1; my $sub = (caller($stack))[3]; $stack++) { last if $sub =~ /^ModPerl/; + last if $sub =~ /^Bugzilla::Template/; $in_eval = 1 if $sub =~ /^\(eval\)/; } return $in_eval; @@ -232,7 +233,7 @@ BEGIN { CGI::Carp::set_die_handler(sub { return if _in_eval(); my $message = shift; - my $is_compilation_failure = $message =~ /\bcompilation aborted\b/; + my $is_compilation_failure = $message =~ /\bcompilation (aborted|failed)\b/i; if (!$is_compilation_failure) { eval { Bugzilla::Error::ThrowTemplateError($message) }; } |