svn commit: r931606 - /spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm

[mm...@apache.org]

Author: mmartinec
Date: Wed Apr  7 16:16:53 2010
New Revision: 931606

URL: http://svn.apache.org/viewvc?rev=931606&view=rev
Log:
avoid undef warnings in AutoWhitelist.pm as a result of
incorrect Received header field or its incorrect parsing
(as in Bug 6402)

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

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm?rev=931606&r1=931605&r2=931606&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm Wed Apr  7 16:16:53 2010
@@ -324,7 +324,9 @@ sub ip_to_awl_key {
   if (defined $result && length($result) > 39) {  # just in case, keep under
     $result = substr($result,0,39);               # the awl.ip field size
   }
-  dbg("auto-whitelist: IP masking %s -> %s", $origip,$result);
+  if (defined $result) {
+    dbg("auto-whitelist: IP masking %s -> %s", $origip,$result);
+  }
   return $result;
 }
 
@@ -336,12 +338,13 @@ sub pack_addr {
   $addr = lc $addr;
   $addr =~ s/[\000\;\'\"\!\|]/_/gs;	# paranoia
 
+  if (defined $origip) {
+    $origip = $self->ip_to_awl_key($origip);
+  }
   if (!defined $origip) {
     # could not find an IP address to use, could be localhost mail
     # or from the user running "add-addr-to-*".
     $origip = 'none';
-  } else {
-    $origip = $self->ip_to_awl_key($origip);
   }
   return $addr . "|ip=" . $origip;
 }