You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by fe...@apache.org on 2006/12/04 22:49:37 UTC
svn commit: r482378 -
/spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
Author: felicity
Date: Mon Dec 4 13:49:35 2006
New Revision: 482378
URL: http://svn.apache.org/viewvc?view=rev&rev=482378
Log:
update token REs to better deal with numbers
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?view=diff&rev=482378&r1=482377&r2=482378
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm Mon Dec 4 13:49:35 2006
@@ -455,7 +455,7 @@
my $eval = '';
my $bad = 0;
foreach my $token (@tokens) {
- if ($token =~ /^(\W+|[\-\+\d\.]+)$/) {
+ if ($token =~ /^(?:\W+|[+-]?\d+(?:\.\d+)?)$/) {
$eval .= $1." "; # note: untaints!
}
elsif ($token eq 'plugin') {
@@ -995,7 +995,7 @@
# Go through each token in the meta rule
foreach my $token (@tokens) {
# Numbers can't be rule names
- if ($token =~ /^(?:\W+|\d+)$/) {
+ if ($token =~ /^(?:\W+|[+-]?\d+(?:\.\d+)?)$/) {
$meta .= "$token ";
}
# Zero will probably cause more errors