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 2018/10/21 14:59:09 UTC
svn commit: r1844490 -
/spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
Author: hege
Date: Sun Oct 21 14:59:09 2018
New Revision: 1844490
URL: http://svn.apache.org/viewvc?rev=1844490&view=rev
Log:
Add empty regex to is_always_matching_regexp
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm?rev=1844490&r1=1844489&r2=1844490&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm Sun Oct 21 14:59:09 2018
@@ -1378,7 +1378,7 @@ sub is_regexp_valid {
if ($self->{conf}->{lint_rules}) {
$self->lint_warn($msg, $name);
} else {
- warn $msg;
+ warn "$msg\n";
return 0;
}
}
@@ -1406,7 +1406,10 @@ sub is_regexp_valid {
sub is_always_matching_regexp {
my ($self, $name, $re) = @_;
- if ($re =~ /(?<!\\)\|\|/) {
+ if ($re eq '') {
+ return "config: empty regexp for rule $name always matches";
+ }
+ elsif ($re =~ /(?<!\\)\|\|/) {
return "config: regexp for rule $name always matches due to '||'";
}
elsif ($re =~ /^\|/) {