Bug 1294650 - Block the version of websense crashing 48 & 49. Followup, we already had this dll r=aklotz,a=Standard8
authorSylvestre Ledru <sledru@mozilla.com>
Fri, 12 Aug 2016 10:45:37 +0200
changeset 347662 a609f6015009feea8362b149ec175f63a5b14cb8
parent 347661 fa8506ec4649acd4ca979fb6039a087d54c1e332
child 347663 65a7a3e61c3af0c22e3c2c30421d2db8443d4b72
push id6389
push userraliiev@mozilla.com
push dateMon, 19 Sep 2016 13:38:22 +0000
treeherdermozilla-beta@01d67bfe6c81 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaklotz, Standard8
bugs1294650
milestone50.0a2
Bug 1294650 - Block the version of websense crashing 48 & 49. Followup, we already had this dll r=aklotz,a=Standard8
mozglue/build/WindowsDllBlocklist.cpp
--- a/mozglue/build/WindowsDllBlocklist.cpp
+++ b/mozglue/build/WindowsDllBlocklist.cpp
@@ -72,16 +72,18 @@ struct DllBlockInfo {
   } flags;
 };
 
 static DllBlockInfo sWindowsDllBlocklist[] = {
   // EXAMPLE:
   // { "uxtheme.dll", ALL_VERSIONS },
   // { "uxtheme.dll", 0x0000123400000000ULL },
   // 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
@@ -122,19 +124,16 @@ static DllBlockInfo sWindowsDllBlocklist
   {"roboform.dll", MAKE_VERSION(7,6,1,0)},
 
   // Topcrash with Babylon Toolbar on FF16+ (bug 721264)
   {"babyfox.dll", ALL_VERSIONS},
 
   // sprotector.dll crashes, bug 957258
   {"sprotector.dll", ALL_VERSIONS},
 
-  // Topcrash with Websense Endpoint, bug 828184
-  {"qipcap.dll", MAKE_VERSION(7, 6, 815, 1)},
-
   // leave these two in always for tests
   { "mozdllblockingtest.dll", ALL_VERSIONS },
   { "mozdllblockingtest_versioned.dll", 0x0000000400000000ULL },
 
   // Windows Media Foundation FLAC decoder and type sniffer (bug 839031).
   { "mfflac.dll", ALL_VERSIONS },
 
   // Older Relevant Knowledge DLLs cause us to crash (bug 904001).
@@ -215,17 +214,17 @@ static DllBlockInfo sWindowsDllBlocklist
   { "opls64.dll", ALL_VERSIONS },
   { "pmls.dll", ALL_VERSIONS },
   { "pmls64.dll", ALL_VERSIONS },
   { "prls.dll", ALL_VERSIONS },
   { "prls64.dll", ALL_VERSIONS },
   { "rlls.dll", ALL_VERSIONS },
   { "rlls64.dll", ALL_VERSIONS },
 
-  // Websense is crashing us on 48 & 49, bug 1291738
+  // Websense is crashing us for bunch of releases, bug 1291738 & bug 828184
   { "qipcap.dll", MAKE_VERSION(7, 6, 818, 1) },
 
   { nullptr, 0 }
 };
 
 #ifndef STATUS_DLL_NOT_FOUND
 #define STATUS_DLL_NOT_FOUND ((DWORD)0xC0000135L)
 #endif