Bug 1446680 - Restrict WindowsDllBlocklist's gStartAddressesToBlock to Nightly builds. r?ccorcoran draft
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sat, 17 Mar 2018 21:14:18 +0100
changeset 768982 c431e5b147b5edc15e288024cec11db5497e6343
parent 768981 eea3a7737f153ef473eca21e2da819e8d8efbfcc
push id103019
push userarchaeopteryx@coole-files.de
push dateSat, 17 Mar 2018 20:16:01 +0000
reviewersccorcoran
bugs1446680
milestone61.0a1
Bug 1446680 - Restrict WindowsDllBlocklist's gStartAddressesToBlock to Nightly builds. r?ccorcoran MozReview-Commit-ID: H3G4fKfpUlf
mozglue/build/WindowsDllBlocklist.cpp
--- a/mozglue/build/WindowsDllBlocklist.cpp
+++ b/mozglue/build/WindowsDllBlocklist.cpp
@@ -860,17 +860,19 @@ static WindowsDllInterceptor Kernel32Int
 MFBT_API void
 DllBlocklist_Initialize(uint32_t aInitFlags)
 {
   if (sBlocklistInitAttempted) {
     return;
   }
   sInitFlags = aInitFlags;
   sBlocklistInitAttempted = true;
+#if defined(NIGHTLY_BUILD)
   gStartAddressesToBlock = new mozilla::Vector<void*, 4>;
+#endif
 
   // In order to be effective against AppInit DLLs, the blocklist must be
   // initialized before user32.dll is loaded into the process (bug 932100).
   if (GetModuleHandleA("user32.dll")) {
     sUser32BeforeBlocklist = true;
 #ifdef DEBUG
     printf_stderr("DLL blocklist was unable to intercept AppInit DLLs.\n");
 #endif