You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by mm...@apache.org on 2019/09/04 13:25:24 UTC
svn commit: r1866387 - in /spamassassin/trunk/lib/Mail/SpamAssassin:
PerMsgStatus.pm RegistryBoundaries.pm
Author: mmartinec
Date: Wed Sep 4 13:25:24 2019
New Revision: 1866387
URL: http://svn.apache.org/viewvc?rev=1866387&view=rev
Log:
Avoid warning: Use of uninitialized value $dom in pattern match (m//) at .../RegistryBoundaries.pm
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
spamassassin/trunk/lib/Mail/SpamAssassin/RegistryBoundaries.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=1866387&r1=1866386&r2=1866387&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Wed Sep 4 13:25:24 2019
@@ -2499,7 +2499,7 @@ sub _process_text_uri_list {
# Skip unless @ found after decoding, then check tld is valid
next unless $uri =~ /\@([^?&>]*)/;
my $host = $1; $host =~ s/(?:\%20)+$//; # strip trailing %20 from host
- next unless $self->{main}->{registryboundaries}->is_domain_valid($1);
+ next unless $self->{main}->{registryboundaries}->is_domain_valid($host);
}
dbg("uri: parsed uri from text ($rawtype): $uri") if $would_log_uri_all;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/RegistryBoundaries.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/RegistryBoundaries.pm?rev=1866387&r1=1866386&r2=1866387&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/RegistryBoundaries.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/RegistryBoundaries.pm Wed Sep 4 13:25:24 2019
@@ -216,6 +216,7 @@ additionally be used.
sub is_domain_valid {
my ($self, $dom, $is_ascii) = @_;
+ return 0 unless defined $dom;
if ($is_ascii) {
utf8::encode($dom) if utf8::is_utf8($dom); # force octets
$dom = lc $dom;