You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2019/07/08 13:32:37 UTC
svn commit: r1862748 - in /spamassassin:
branches/3.4/lib/Mail/SpamAssassin/Plugin/AskDNS.pm
trunk/lib/Mail/SpamAssassin/Plugin/AskDNS.pm
Author: hege
Date: Mon Jul 8 13:32:37 2019
New Revision: 1862748
URL: http://svn.apache.org/viewvc?rev=1862748&view=rev
Log:
Add Bug 7725 fix to AskDNS too
Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AskDNS.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/AskDNS.pm
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AskDNS.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AskDNS.pm?rev=1862748&r1=1862747&r2=1862748&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AskDNS.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AskDNS.pm Mon Jul 8 13:32:37 2019
@@ -628,8 +628,8 @@ sub process_response_packet {
!defined $n2 ? ($rdatanum & $n1) && # mask only
(($rdatanum & 0xff000000) == 0x7f000000) # 127/8
: $delim eq '-' ? $rdatanum >= $n1 && $rdatanum <= $n2 # range
- : $delim eq '/' ? ($rdatanum & $n2) == ($n1 & $n2) # value/mask
- : 0;
+ : $delim eq '/' ? ($rdatanum & $n2) == (int($n1) & $n2) # value/mask
+ : 0; # notice int($n1) to fix perl ~5.14 taint bug (Bug 7725)
}
if ($match) {
$self->askdns_hit($pms, $ent->{query_domain}, $qtype,
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/AskDNS.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/AskDNS.pm?rev=1862748&r1=1862747&r2=1862748&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/AskDNS.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/AskDNS.pm Mon Jul 8 13:32:37 2019
@@ -631,8 +631,8 @@ sub process_response_packet {
!defined $n2 ? ($rdatanum & $n1) && # mask only
(($rdatanum & 0xff000000) == 0x7f000000) # 127/8
: $delim eq '-' ? $rdatanum >= $n1 && $rdatanum <= $n2 # range
- : $delim eq '/' ? ($rdatanum & $n2) == ($n1 & $n2) # value/mask
- : 0;
+ : $delim eq '/' ? ($rdatanum & $n2) == (int($n1) & $n2) # value/mask
+ : 0; # notice int($n1) to fix perl ~5.14 taint bug (Bug 7725)
}
if ($match) {
$self->askdns_hit($pms, $ent->{query_domain}, $qtype,