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 2021/12/01 18:08:14 UTC
svn commit: r1895473 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/OLEVBMacro.pm
Author: gbechis
Date: Wed Dec 1 18:08:14 2021
New Revision: 1895473
URL: http://svn.apache.org/viewvc?rev=1895473&view=rev
Log:
Match every file under xl/embeddings directory
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=1895473&r1=1895472&r2=1895473&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/OLEVBMacro.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/OLEVBMacro.pm Wed Dec 1 18:08:14 2021
@@ -821,9 +821,7 @@ sub _check_macrotype_doc {
'ppt/vbaproject.bin' => 'ppt2k7',
);
- my %olefiles = (
- 'xl/embeddings/oleobject1.bin' => 'xl2k13',
- );
+ my $oledir = 'xl/embeddings/';
my @members = $zip->members();
foreach my $member (@members){
@@ -833,8 +831,8 @@ sub _check_macrotype_doc {
$pms->{olemacro_exists} = 1;
last;
}
- if (exists($olefiles{lc($mname)})) {
- dbg("Found $olefiles{$mname} ole file");
+ if ($mname =~ /^$oledir/) {
+ dbg("Found $mname ole file");
$pms->{oleobject_exists} = 1;
last;
}