This is an automated email from the git hooks/post-receive script.
pierov pushed a commit to branch geckoview-99.0.1-11.0-1 in repository tor-browser.
commit 61f4b43bc969f2658f56ff2c62541d470ad6a37c Author: donal meehan dmeehan@mozilla.com AuthorDate: Mon Apr 11 12:35:53 2022 -0400
Backed out changeset e76373d064bc (bug 1757487) backed out for causing bug 1762576 --- toolkit/xre/dllservices/mozglue/WindowsDllBlocklist.cpp | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/toolkit/xre/dllservices/mozglue/WindowsDllBlocklist.cpp b/toolkit/xre/dllservices/mozglue/WindowsDllBlocklist.cpp index 277a6749bed31..9af8081b74762 100644 --- a/toolkit/xre/dllservices/mozglue/WindowsDllBlocklist.cpp +++ b/toolkit/xre/dllservices/mozglue/WindowsDllBlocklist.cpp @@ -531,9 +531,11 @@ continue_loading: return ret; }
+#if defined(EARLY_BETA_OR_EARLIER) // Map of specific thread proc addresses we should block. In particular, // LoadLibrary* APIs which indicate DLL injection static void* gStartAddressesToBlock[4]; +#endif // defined(EARLY_BETA_OR_EARLIER)
static bool ShouldBlockThread(void* aStartAddress) { // Allows crashfirefox.exe to continue to work. Also if your threadproc is @@ -542,11 +544,13 @@ static bool ShouldBlockThread(void* aStartAddress) { return false; }
+#if defined(EARLY_BETA_OR_EARLIER) for (auto p : gStartAddressesToBlock) { if (p == aStartAddress) { return true; } } +#endif
bool shouldBlock = false; MEMORY_BASIC_INFORMATION startAddressInfo = {0}; @@ -614,6 +618,7 @@ MFBT_API void DllBlocklist_Initialize(uint32_t aInitFlags) { } }
+#if defined(EARLY_BETA_OR_EARLIER) // Populate a list of thread start addresses to block. HMODULE hKernel = GetModuleHandleW(L"kernel32.dll"); if (hKernel) { @@ -631,6 +636,7 @@ MFBT_API void DllBlocklist_Initialize(uint32_t aInitFlags) { pProc = (void*)GetProcAddress(hKernel, "LoadLibraryExW"); gStartAddressesToBlock[3] = pProc; } +#endif
if (aInitFlags & eDllBlocklistInitFlagWasBootstrapped) { GetNativeNtBlockSetWriter();