tor-browser

commit bb814039efd53e9a56147f4de7e0ad9a22574e52
parent f04dcd883f925452e53fdf1e85e320bd1264f619
Author: Dan Ballard <dan@mindstab.net>
Date:   Fri, 21 Oct 2022 11:39:58 -0700

BB 41149: Re-enable DLL injection protection in all builds not just nightlies

Diffstat:
M
toolkit/xre/dllservices/mozglue/WindowsDllBlocklist.cpp
 | 
6
+++---

1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/toolkit/xre/dllservices/mozglue/WindowsDllBlocklist.cpp b/toolkit/xre/dllservices/mozglue/WindowsDllBlocklist.cpp
@@ -521,7 +521,7 @@ continue_loading:
   return ret;
 }
 
-#if defined(BLOCK_LOADLIBRARY_INJECTION)
+#if defined(BLOCK_LOADLIBRARY_INJECTION) || defined(BASE_BROWSER_VERSION)
 // Map of specific thread proc addresses we should block. In particular,
 // LoadLibrary* APIs which indicate DLL injection
 static void* gStartAddressesToBlock[4];
@@ -534,7 +534,7 @@ static bool ShouldBlockThread(void* aStartAddress) {
     return false;
   }
 
-#if defined(BLOCK_LOADLIBRARY_INJECTION)
+#if defined(BLOCK_LOADLIBRARY_INJECTION) || defined(BASE_BROWSER_VERSION)
   for (auto p : gStartAddressesToBlock) {
     if (p == aStartAddress) {
       return true;
@@ -597,7 +597,7 @@ MFBT_API void DllBlocklist_Initialize(uint32_t aInitFlags) {
     }
   }
 
-#if defined(BLOCK_LOADLIBRARY_INJECTION)
+#if defined(BLOCK_LOADLIBRARY_INJECTION) || defined(BASE_BROWSER_VERSION)
   // Populate a list of thread start addresses to block.
   HMODULE hKernel = GetModuleHandleW(L"kernel32.dll");
   if (hKernel) {