Commit e4e6bca5 authored by Dan Ballard's avatar Dan Ballard Committed by Pier Angelo Vendrame
Browse files

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

parent 518b5a7f

toolkit/xre/dllservices/mozglue/WindowsDllBlocklist.cpp

+3 −3
Original line number Diff line number Diff line
@@ -519,7 +519,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];
@@ -532,7 +532,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;
@@ -595,7 +595,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) {