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 2023/08/04 15:21:59 UTC
svn commit: r1911441 - in /spamassassin: branches/3.4/lib/Mail/SpamAssassin/HTML.pm trunk/lib/Mail/SpamAssassin/HTML.pm
Author: hege
Date: Fri Aug 4 15:21:59 2023
New Revision: 1911441
URL: http://svn.apache.org/viewvc?rev=1911441&view=rev
Log:
Bug 7892 - T_KAM_HTML_FONT_INVALID false positive for "<color> !important"
Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/HTML.pm
spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/HTML.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/HTML.pm?rev=1911441&r1=1911440&r2=1911441&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/HTML.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/HTML.pm Fri Aug 4 15:21:59 2023
@@ -515,6 +515,9 @@ sub text_style {
if (/^\s*(background-)?color:\s*(.+?)\s*$/i) {
my $whcolor = $1 ? 'bgcolor' : 'fgcolor';
my $value = lc $2;
+ # prevent parsing of the valid CSS3 property value as
+ # 'invalid color' (Bug 7892)
+ $value =~ s/\s+!important$//;
if ($value =~ /rgb/) {
$value =~ tr/0-9,//cd;
@@ -527,10 +530,6 @@ sub text_style {
# do nothing, just prevent parsing of the valid
# CSS3 property value as 'invalid color' (Bug 7778)
}
- elsif ($value eq '!important') {
- # do nothing, just prevent parsing of the valid
- # CSS3 property value as 'invalid color' (Bug 7892)
- }
else {
$new{$whcolor} = name_to_rgb($value);
}
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm?rev=1911441&r1=1911440&r2=1911441&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm Fri Aug 4 15:21:59 2023
@@ -540,6 +540,9 @@ sub text_style {
if (/^\s*(background-)?color:\s*(.+?)\s*$/i) {
my $whcolor = $1 ? 'bgcolor' : 'fgcolor';
my $value = lc $2;
+ # prevent parsing of the valid CSS3 property value as
+ # 'invalid color' (Bug 7892)
+ $value =~ s/\s+!important$//;
if (index($value, 'rgb') >= 0) {
$value =~ tr/0-9,//cd;
@@ -552,10 +555,6 @@ sub text_style {
# do nothing, just prevent parsing of the valid
# CSS3 property value as 'invalid color' (Bug 7778)
}
- elsif ($value eq '!important') {
- # do nothing, just prevent parsing of the valid
- # CSS3 property value as 'invalid color' (Bug 7892)
- }
else {
$new{$whcolor} = name_to_rgb($value);
}