Change to __ImageBase linker directive to fight possible Windows 7 ra…

…ce condition.
win32ss · Mar 8, 2024 · 25cef38 · 25cef38
1 parent ebdfdf3
commit 25cef38
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/base/allocator/partition_allocator/src/partition_alloc/shim/shim_alloc_functions.h b/base/allocator/partition_allocator/src/partition_alloc/shim/shim_alloc_functions.h
@@ -22,8 +22,10 @@
 #if BUILDFLAG(IS_WIN)
 #include <Windows.h>
 extern "C" {
-VOID __stdcall TLSInit_DllMain_ThreadAttach(HMODULE DllBase);
+VOID __stdcall TLSInit_DllMain_ThreadAttach(IMAGE_DOS_HEADER* DllBase);
 }
+EXTERN_C IMAGE_DOS_HEADER __ImageBase;
+#define HINST_THISCOMPONENT ((HINSTANCE)&__ImageBase)
 #endif
 
 namespace {
@@ -120,7 +122,7 @@ PA_ALWAYS_INLINE void* ShimMalloc(size_t size, void* context) {
 
 PA_ALWAYS_INLINE void* ShimCalloc(size_t n, size_t size, void* context) {
   #if BUILDFLAG(IS_WIN)
-	TLSInit_DllMain_ThreadAttach(::GetModuleHandleA("chrome.dll"));
+	TLSInit_DllMain_ThreadAttach(&__ImageBase);
   #endif
   const allocator_shim::AllocatorDispatch* const chain_head =
       allocator_shim::internal::GetChainHead();

diff --git a/base/sampling_heap_profiler/poisson_allocation_sampler.cc b/base/sampling_heap_profiler/poisson_allocation_sampler.cc
@@ -23,9 +23,10 @@
 #if BUILDFLAG(IS_WIN)
 #include <windows.h>
 extern "C" {
-VOID __stdcall TLSInit_DllMain_ThreadAttach(HMODULE DllBase);
+VOID __stdcall TLSInit_DllMain_ThreadAttach(IMAGE_DOS_HEADER* DllBase);
 }
-
+EXTERN_C IMAGE_DOS_HEADER __ImageBase;
+#define HINST_THISCOMPONENT ((HINSTANCE)&__ImageBase)
 #endif
 
 namespace base {
@@ -251,7 +252,7 @@ void PoissonAllocationSampler::DoRecordAllocation(
     const char* context) {
 
   #if BUILDFLAG(IS_WIN)
-	TLSInit_DllMain_ThreadAttach(::GetModuleHandleA("chrome.dll"));
+	TLSInit_DllMain_ThreadAttach(&__ImageBase);
   #endif
   ThreadLocalData* const thread_local_data = GetThreadLocalData();