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 2020/02/07 18:37:10 UTC
svn commit: r1873752 -
/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/OLEVBMacro.pm
Author: gbechis
Date: Fri Feb 7 18:37:10 2020
New Revision: 1873752
URL: http://svn.apache.org/viewvc?rev=1873752&view=rev
Log:
sync OLEVBMacro plugin with trunk
Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/OLEVBMacro.pm
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/OLEVBMacro.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/OLEVBMacro.pm?rev=1873752&r1=1873751&r2=1873752&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/OLEVBMacro.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/OLEVBMacro.pm Fri Feb 7 18:37:10 2020
@@ -750,12 +750,13 @@ sub _check_macrotype_doc {
my $zip = _open_zip_handle($data);
return 0 unless $zip;
- #https://www.decalage.info/vba_tools
+ # https://www.decalage.info/vba_tools
+ # Consider macrofiles as lowercase, they are checked later with a case-insensitive method
my %macrofiles = (
'word/vbaproject.bin' => 'word2k7',
'macros/vba/_vba_project' => 'word97',
'xl/vbaproject.bin' => 'xl2k7',
- 'xl/embeddings/oleObject1.bin' => 'xl2k13',
+ 'xl/embeddings/oleobject1.bin' => 'xl2k13',
'_vba_project_cur/vba/_vba_project' => 'xl97',
'ppt/vbaproject.bin' => 'ppt2k7',
);
@@ -763,7 +764,7 @@ sub _check_macrotype_doc {
my @members = $zip->members();
foreach my $member (@members){
my $mname = lc $member->fileName();
- if (exists($macrofiles{$mname})) {
+ if (exists($macrofiles{lc($mname)})) {
dbg("Found $macrofiles{$mname} vba file");
$pms->{olemacro_exists} = 1;
last;