You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by qu...@apache.org on 2004/12/08 22:11:42 UTC
svn commit: r111313 - /spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
Author: quinlan
Date: Wed Dec 8 13:11:40 2004
New Revision: 111313
URL: http://svn.apache.org/viewcvs?view=rev&rev=111313
Log:
handle overflow for hex-encoded IP addresses
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
Url: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm?view=diff&rev=111313&p1=spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm&r1=111312&p2=spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm&r2=111313
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm Wed Dec 8 13:11:40 2004
@@ -907,7 +907,8 @@
# "http://0x7f000001/"
elsif ($host =~ /^0x[0-9a-f]+$/i) {
- $host =~ s/^0x([0-9a-f]+)/sprintf "%d",hex($1)/gei;
+ # only take last 4 octets
+ $host =~ s/^0x[0-9a-f]*?([0-9a-f]{1,8})$/sprintf "%d",hex($1)/gei;
push(@nuris, join ('', $proto, decode_ulong_to_ip($host), $rest));
}