Bug 812683 - Fix various crashes in Windows graphics libraries by blocking the ASUS Gamer OSD software, which is discontinued and unsupported, r=jrmuizel
authorBenjamin Smedberg <benjamin@smedbergs.us>
Fri, 18 Oct 2013 14:24:08 -0400
changeset 165361 74252b21fdacc74c1cd7c78fca225dba8cbdfb20
parent 165360 6567ee93f799dd85abfda328a3e9aa6b2c909d3a
child 165362 d04bbdfff591d7517f8f8cc0f1f51d806a21d4b6
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel
bugs812683
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 812683 - Fix various crashes in Windows graphics libraries by blocking the ASUS Gamer OSD software, which is discontinued and unsupported, r=jrmuizel
toolkit/xre/nsWindowsDllBlocklist.cpp
--- a/toolkit/xre/nsWindowsDllBlocklist.cpp
+++ b/toolkit/xre/nsWindowsDllBlocklist.cpp
@@ -133,16 +133,20 @@ static DllBlockInfo sWindowsDllBlocklist
 
   // Older belgian ID card software causes Firefox to crash or hang on
   // shutdown, bug 831285 and 918399.
   { "beid35cardlayer.dll", MAKE_VERSION(3, 5, 6, 6968) },
 
   // bug 925459, bitguard crashes
   { "bitguard.dll", MAKE_VERSION(2, 6, 1694, 24) },
 
+  // bug 812683 - crashes in Windows library when Asus Gamer OSD is installed
+  // Software is discontinued/unsupported
+  { "atkdx11disp.dll", ALL_VERSIONS },
+
   { nullptr, 0 }
 };
 
 #ifndef STATUS_DLL_NOT_FOUND
 #define STATUS_DLL_NOT_FOUND ((DWORD)0xC0000135L)
 #endif
 
 // define this for very verbose dll load debug spew