Bug 1410073: Load user32.dll immediately after the DLL Blocklist is i…

…n place. r=aklotz This is to reduce the chance of it being loaded on an injected thread.
dothq · Oct 19, 2017 · 75a8563 · 75a8563
1 parent 6e7d4d6
commit 75a8563
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/mozglue/build/WindowsDllBlocklist.cpp b/mozglue/build/WindowsDllBlocklist.cpp
@@ -863,6 +863,13 @@ DllBlocklist_Initialize(uint32_t aInitFlags)
 #endif
   }
 
+  // If someone injects a thread early that causes user32.dll to load off the
+  // main thread this causes issues, so load it as soon as we've initialized
+  // the block-list. (See bug 1400637)
+  if (!sUser32BeforeBlocklist) {
+    ::LoadLibraryW(L"user32.dll");
+  }
+
   Kernel32Intercept.Init("kernel32.dll");
 
 #ifdef _M_AMD64