From 812ad9b3515aff6d9d870c2a11845b7416e40288 Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Sat, 24 Jan 2009 14:12:05 +0000
Subject: Bug 471613: Replace Bugzilla::Util::is_tainted() by
 Scalar::Util::tainted() - Patch by Nitish Bezzala <nbezzala@yahoo.com>
 r/a=LpSolit

---
 Bugzilla/Install/Util.pm | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'Bugzilla/Install/Util.pm')

diff --git a/Bugzilla/Install/Util.pm b/Bugzilla/Install/Util.pm
index 9cec8c435..250ab9157 100644
--- a/Bugzilla/Install/Util.pm
+++ b/Bugzilla/Install/Util.pm
@@ -31,6 +31,7 @@ use Bugzilla::Constants;
 use File::Basename;
 use POSIX qw(setlocale LC_CTYPE);
 use Safe;
+use Scalar::Util qw(tainted);
 
 use base qw(Exporter);
 our @EXPORT_OK = qw(
@@ -109,7 +110,7 @@ sub install_string {
     foreach my $key (@replace_keys) {
         my $replacement = $vars->{$key};
         die "'$key' in '$string_id' is tainted: '$replacement'"
-            if is_tainted($replacement);
+            if tainted($replacement);
         # We don't want people to start getting clever and inserting
         # ##variable## into their values. So we check if any other
         # key is listed in the *replacement* string, before doing
@@ -354,10 +355,6 @@ sub trick_taint {
     return (defined($_[0]));
 }
 
-sub is_tainted {
-    return not eval { my $foo = join('',@_), kill 0; 1; };
-}
-
 __END__
 
 =head1 NAME
-- 
cgit v1.2.3-24-g4f1b