You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by do...@apache.org on 2005/05/12 08:48:34 UTC

svn commit: r169780 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/MIMEHeader.pm

Author: dos
Date: Wed May 11 23:48:33 2005
New Revision: 169780

URL: http://svn.apache.org/viewcvs?rev=169780&view=rev
Log:
some undelimited regexps were causing make_qr to stop execution

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/MIMEHeader.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/MIMEHeader.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/MIMEHeader.pm?rev=169780&r1=169779&r2=169780&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/MIMEHeader.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/MIMEHeader.pm Wed May 11 23:48:33 2005
@@ -102,12 +102,10 @@
       my $negated = ($3 eq '!~') ? 1 : 0;
       my $pattern = $4;
 
-      if (!$pattern || !$self->{parser}->is_regexp_valid($rulename, $pattern))
-      {
-        return $Mail::SpamAssassin::Conf::INVALID_VALUE;
-      }
+      return unless $self->{parser}->is_delimited_regexp_valid($rulename, $pattern);
 
       $pattern = $pluginobj->make_qr($pattern);
+      return $Mail::SpamAssassin::Conf::INVALID_VALUE unless $pattern;
 
       $self->{mimeheader_tests}->{$rulename} = {
         hdr => $hdrname,