svn commit: r578110 - /spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm

[mm...@apache.org]

Author: mmartinec
Date: Fri Sep 21 06:54:40 2007
New Revision: 578110

URL: http://svn.apache.org/viewvc?rev=578110&view=rev
Log:
remove a bug 5283 workaround which is now redundant (see bug 5645)

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

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm?rev=578110&r1=578109&r2=578110&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm Fri Sep 21 06:54:40 2007
@@ -362,20 +362,13 @@
   
   return $self->{pristine_headers} unless $hdr;
   my(@ret) = $self->{pristine_headers} =~ /^\Q$hdr\E:[ \t]+(.*?\n(?![ \t]))/smgi;
-  if (@ret) {
-    # ensure the response retains taintedness (bug 5283);
-    # Note: this is already ensured by the:  use re 'taint'
-    # in this module and is probably redundant now.
-    if (wantarray) {
-      return map {
-                Mail::SpamAssassin::Util::taint_var($_);
-              } @ret;
-    } else {
-      return Mail::SpamAssassin::Util::taint_var($ret[-1]);
-    }
-  }
-  else {
+  # taintedness is retained by "use re 'taint'" (fix in bug 5283 now redundant)
+  if (!@ret) {
     return $self->get_header($hdr);
+  } elsif (wantarray) {
+    return @ret;
+  } else {
+    return $ret[-1];
   }
 }