From f5797cb1245bb33eebe57067ba58e58666d1899b Mon Sep 17 00:00:00 2001
From: Chris Pearce <cpearce@mozilla.com>
Date: Fri, 23 Sep 2016 14:18:04 +1200
Subject: [PATCH] Bug 1239690 - Add vorbis.acm version 0.0.3.6 to the DLL
 blocklist. r=aklotz

Vorbis.acm seems to be somehow injecting itself into our process, and also the
Flash process, and intercepting the system audio APIs. Version 0.0.3.6 seems to
be crashing, and it's an obsolete version, so we should block it to stop it
crashing us.


MozReview-Commit-ID: Hk93kG0Ly4Q

--HG--
extra : rebase_source : b16dd8decdc8a767bd84f28a009667b4d79677d8
---
 mozglue/build/WindowsDllBlocklist.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/mozglue/build/WindowsDllBlocklist.cpp b/mozglue/build/WindowsDllBlocklist.cpp
index 867e4e8aedfc..37ab4d80cf04 100644
--- a/mozglue/build/WindowsDllBlocklist.cpp
+++ b/mozglue/build/WindowsDllBlocklist.cpp
@@ -79,19 +79,19 @@ static DllBlockInfo sWindowsDllBlocklist[] = {
   // The DLL name must be in lowercase!
   // The version field is a maximum, that is, we block anything that is
   // less-than or equal to that version.
-  
+
   // NPFFAddon - Known malware
   { "npffaddon.dll", ALL_VERSIONS},
 
   // AVG 8 - Antivirus vendor AVG, old version, plugin already blocklisted
   {"avgrsstx.dll", MAKE_VERSION(8,5,0,401)},
-  
+
   // calc.dll - Suspected malware
   {"calc.dll", MAKE_VERSION(1,0,0,1)},
 
   // hook.dll - Suspected malware
   {"hook.dll", ALL_VERSIONS},
-  
+
   // GoogleDesktopNetwork3.dll - Extremely old, unversioned instances
   // of this DLL cause crashes
   {"googledesktopnetwork3.dll", UNVERSIONED},
@@ -101,7 +101,7 @@ static DllBlockInfo sWindowsDllBlocklist[] = {
 
   // fgjk4wvb.dll - Suspected malware
   {"fgjk4wvb.dll", MAKE_VERSION(8,8,8,8)},
-  
+
   // radhslib.dll - Naomi internet filter - unmaintained since 2006
   {"radhslib.dll", UNVERSIONED},
 
@@ -219,6 +219,9 @@ static DllBlockInfo sWindowsDllBlocklist[] = {
   { "rlls.dll", ALL_VERSIONS },
   { "rlls64.dll", ALL_VERSIONS },
 
+  // Vorbis DirectShow filters, bug 1239690.
+  { "vorbis.acm", MAKE_VERSION(0, 0, 3, 6) },
+
   { nullptr, 0 }
 };
 
@@ -397,7 +400,7 @@ public:
     mReentered = mPreviousDllName && !stricmp(mPreviousDllName, dllName);
     (*sThreadMap)[currentThreadId] = dllName;
   }
-    
+
   ~ReentrancySentinel()
   {
     DWORD currentThreadId = GetCurrentThreadId();
@@ -409,7 +412,7 @@ public:
   {
     return mReentered;
   };
-    
+
   static void InitializeStatics()
   {
     InitializeCriticalSection(&sLock);