Skip to content
Snippets Groups Projects
Verified Commit 925d8e63 authored by Dan Ballard's avatar Dan Ballard Committed by Pier Angelo Vendrame
Browse files

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

parent 7e253a0e
No related branches found
No related tags found
1 merge request!543Tor Browser 12.5a 102.8.0esr rebase
Hide whitespace changes
Inline Side-by-side
toolkit/xre/dllservices/mozglue/WindowsDllBlocklist.cpp
+ 3
− 3
View file @ 925d8e63
...@@ -531,7 +531,7 @@ continue_loading: ...@@ -531,7 +531,7 @@ continue_loading:
return ret; return ret;
} }
#if defined(NIGHTLY_BUILD) #if defined(NIGHTLY_BUILD) || defined(BASE_BROWSER)
// Map of specific thread proc addresses we should block. In particular, // Map of specific thread proc addresses we should block. In particular,
// LoadLibrary* APIs which indicate DLL injection // LoadLibrary* APIs which indicate DLL injection
static void* gStartAddressesToBlock[4]; static void* gStartAddressesToBlock[4];
...@@ -544,7 +544,7 @@ static bool ShouldBlockThread(void* aStartAddress) { ...@@ -544,7 +544,7 @@ static bool ShouldBlockThread(void* aStartAddress) {
return false; return false;
} }
#if defined(NIGHTLY_BUILD) #if defined(NIGHTLY_BUILD) || defined(BASE_BROWSER)
for (auto p : gStartAddressesToBlock) { for (auto p : gStartAddressesToBlock) {
if (p == aStartAddress) { if (p == aStartAddress) {
return true; return true;
...@@ -618,7 +618,7 @@ MFBT_API void DllBlocklist_Initialize(uint32_t aInitFlags) { ...@@ -618,7 +618,7 @@ MFBT_API void DllBlocklist_Initialize(uint32_t aInitFlags) {
} }
} }
#if defined(NIGHTLY_BUILD) #if defined(NIGHTLY_BUILD) || defined(BASE_BROWSER)
// Populate a list of thread start addresses to block. // Populate a list of thread start addresses to block.
HMODULE hKernel = GetModuleHandleW(L"kernel32.dll"); HMODULE hKernel = GetModuleHandleW(L"kernel32.dll");
if (hKernel) { if (hKernel) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment