svn commit: r169928 - in /spamassassin/trunk: lib/Mail/SpamAssassin/Conf/Parser.pm t/regexp_valid.t

[jm...@apache.org]

Author: jm
Date: Thu May 12 20:15:15 2005
New Revision: 169928

URL: http://svn.apache.org/viewcvs?rev=169928&view=rev
Log:
bug 4327: SARE html0 ruleset exposed a bug, fixed by using \Q and \E

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
    spamassassin/trunk/t/regexp_valid.t

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm?rev=169928&r1=169927&r2=169928&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm Thu May 12 20:15:15 2005
@@ -848,7 +848,7 @@
     $re =~ s/>([a-z]*)$//; $mods = $1;
   }
   elsif ($re =~ s/^m(\W)//) {
-    $re =~ s/$1([a-z]*)$//; $mods = $1;
+    $re =~ s/\Q$1\E([a-z]*)$//; $mods = $1;
   }
   elsif ($re =~ s/^\/(.*)\/([a-z]*)$/$1/) {
     $mods = $2;

Modified: spamassassin/trunk/t/regexp_valid.t
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/t/regexp_valid.t?rev=169928&r1=169927&r2=169928&view=diff
==============================================================================
--- spamassassin/trunk/t/regexp_valid.t (original)
+++ spamassassin/trunk/t/regexp_valid.t Thu May 12 20:15:15 2005
@@ -24,7 +24,7 @@
 use vars qw(%patterns %anti_patterns);
 
 # settings
-plan tests => 24;
+plan tests => 26;
 
 # initialize SpamAssassin
 my $sa = create_saobj({'dont_copy_prefs' => 1});
@@ -61,4 +61,7 @@
 
 ok !tryone '/test//';
 ok tryone '.*';
+
+ok tryone 'm*<a[^<]{0,60} onMouseMove=(?:3D)?"window.status=(?:3D)?\'https?://*';
+ok tryone 'm*<a[^<]{0,60} onMouseMove=(?:3D)?"window.status=(?:3D)?\'https?://*';