You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by si...@apache.org on 2005/09/10 06:35:51 UTC
svn commit: r279946 -
/spamassassin/branches/3.1/lib/Mail/SpamAssassin/Message.pm
Author: sidney
Date: Fri Sep 9 21:35:43 2005
New Revision: 279946
URL: http://svn.apache.org/viewcvs?rev=279946&view=rev
Log:
Bug 4570 fix regexp to not segfault given large headers
Modified:
spamassassin/branches/3.1/lib/Mail/SpamAssassin/Message.pm
Modified: spamassassin/branches/3.1/lib/Mail/SpamAssassin/Message.pm
URL: http://svn.apache.org/viewcvs/spamassassin/branches/3.1/lib/Mail/SpamAssassin/Message.pm?rev=279946&r1=279945&r2=279946&view=diff
==============================================================================
--- spamassassin/branches/3.1/lib/Mail/SpamAssassin/Message.pm (original)
+++ spamassassin/branches/3.1/lib/Mail/SpamAssassin/Message.pm Fri Sep 9 21:35:43 2005
@@ -368,7 +368,7 @@
my ($self, $hdr) = @_;
return $self->{pristine_headers} unless $hdr;
- my(@ret) = $self->{pristine_headers} =~ /^(?:$hdr:[ \t]+(.*\n(?:\s+\S.*\n)*))/mig;
+ my(@ret) = $self->{pristine_headers} =~ /^\Q$hdr\E:[ \t]+(.*?\n(?![ \t]))/smgi;
if (@ret) {
return wantarray ? @ret : $ret[-1];
}