You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@spamassassin.apache.org by gb...@apache.org on 2022/10/10 06:43:47 UTC

svn commit: r1904481 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/OLEVBMacro.pm

Author: gbechis
Date: Mon Oct 10 06:43:47 2022
New Revision: 1904481

URL: http://svn.apache.org/viewvc?rev=1904481&view=rev
Log:
check for Office 2003 markers only when needed
bz #8055

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

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/OLEVBMacro.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/OLEVBMacro.pm?rev=1904481&r1=1904480&r2=1904481&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/OLEVBMacro.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/OLEVBMacro.pm Mon Oct 10 06:43:47 2022
@@ -1004,6 +1004,7 @@ sub _is_zip_file {
 sub _check_markers {
   my ($data) = @_;
 
+  # Check for Office 2003 markers
   if (index($data, $marker1) == 0) {
     if (index($data, $marker2) > -1) {
       dbg('Marker 1 & 2 found');
@@ -1013,8 +1014,10 @@ sub _check_markers {
       dbg('Marker 1 & 2a found');
       return 1;
     }
+    return 0;
   }
 
+  # Check for rtf markers
   if (index($data, $marker3) > -1) {
     dbg('Marker 3 found');
     return 1;
@@ -1030,6 +1033,7 @@ sub _check_markers {
     return 1;
   }
 
+  # Check for Office 2007 markers
   if (index($data, 'w:macrosPresent="yes"') > -1) {
     dbg('XML macros marker found');
     return 1;