Mailing List Archive

Author: hege
Date: Sun Oct 17 07:17:32 2021
New Revision: 1894308

URL: http://svn.apache.org/viewvc?rev=1894308&view=rev
Log:
Bug 7931 - Undefined subroutine &Scalar::Util::tainted

Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message.pm?rev=1894308&r1=1894307&r2=1894308&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message.pm Sun Oct 17 07:17:32 2021
@@ -51,6 +51,8 @@ BEGIN {
or do { require Digest::SHA1; import Digest::SHA1 qw(sha1 sha1_hex) }
}

+use Scalar::Util qw(tainted);
+
use Mail::SpamAssassin;
use Mail::SpamAssassin::Message::Node;
use Mail::SpamAssassin::Message::Metadata;
@@ -207,14 +209,14 @@ sub new {
# messages? Tainting the message is important because it prevents certain
# exploits later.
if (Mail::SpamAssassin::Util::am_running_in_taint_mode() &&
- grep { !Scalar::Util::tainted($_) } @message) {
+ grep { !tainted($_) } @message) {
local($_);
# To preserve newlines, no joining and splitting here, process each line
# directly as is.
foreach (@message) {
$_ = Mail::SpamAssassin::Util::taint_var($_);
}
- if (grep { !Scalar::Util::tainted($_) } @message) {
+ if (grep { !tainted($_) } @message) {
die "Mail::SpamAssassin::Message failed to enforce message taintness";
}
}

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm?rev=1894308&r1=1894307&r2=1894308&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm Sun Oct 17 07:17:32 2021
@@ -47,6 +47,7 @@ use warnings;
use re 'taint';

use Digest::SHA qw(sha1 sha1_hex);
+use Scalar::Util qw(tainted);

use Mail::SpamAssassin;
use Mail::SpamAssassin::Message::Node;
@@ -204,14 +205,14 @@ sub new {
# messages? Tainting the message is important because it prevents certain
# exploits later.
if (Mail::SpamAssassin::Util::am_running_in_taint_mode() &&
- grep { !Scalar::Util::tainted($_) } @message) {
+ grep { !tainted($_) } @message) {
local($_);
# To preserve newlines, no joining and splitting here, process each line
# directly as is.
foreach (@message) {
$_ = Mail::SpamAssassin::Util::taint_var($_);
}
- if (grep { !Scalar::Util::tainted($_) } @message) {
+ if (grep { !tainted($_) } @message) {
die "Mail::SpamAssassin::Message failed to enforce message taintness";
}
}