fix if the hook is not called at the start of the process, the hook m…

…ay fail
microsoft · Sep 4, 2020 · b492481 · b492481
1 parent 8298cdc
commit b492481
Show file tree

Hide file tree

Showing 7 changed files with 534 additions and 49 deletions.
diff --git a/samples/common.mak b/samples/common.mak
@@ -23,7 +23,7 @@ CLIB=/MT
 !ENDIF
 
 AFLAGS=/nologo /Zi /c /Fl
-CFLAGS=/nologo /Zi $(CLIB) /Gm- /W4 /WX /we4777 /we4800 /Od
+CFLAGS=/nologo /Zi $(CLIB) /Gm- /W4 /WX /we4777 /we4800 /Od /D__AUTO_CREATE_DETOUR_HEAP__
 
 !IF $(DETOURS_SOURCE_BROWSING)==1
 CFLAGS=$(CFLAGS) /FR

diff --git a/src/creatwth.cpp b/src/creatwth.cpp
@@ -1023,7 +1023,7 @@ VOID CALLBACK DetourFinishHelperProcess(_In_ HWND,
         goto Cleanup;
     }
 
-    rlpDlls = new NOTHROW LPCSTR [s_pHelper->nDlls];
+    rlpDlls = DetourCreateObjectArray<LPCSTR>(s_pHelper->nDlls);
     cSize = s_pHelper->cb - sizeof(DETOUR_EXE_HELPER);
     for (DWORD n = 0; n < s_pHelper->nDlls; n++) {
         size_t cchDest = 0;
@@ -1047,7 +1047,7 @@ VOID CALLBACK DetourFinishHelperProcess(_In_ HWND,
 
   Cleanup:
     if (rlpDlls != NULL) {
-        delete[] rlpDlls;
+        DetourDestroyObjectArray(rlpDlls);
         rlpDlls = NULL;
     }
 
@@ -1124,7 +1124,7 @@ BOOL WINAPI AllocExeHelper(_Out_ PDETOUR_EXE_HELPER *pHelper,
         cSize += (DWORD)cchDest + 1;
     }
 
-    Helper = (PDETOUR_EXE_HELPER) new NOTHROW BYTE[sizeof(DETOUR_EXE_HELPER) + cSize];
+    Helper = (PDETOUR_EXE_HELPER)DetourCreateObjectArray<BYTE>(sizeof(DETOUR_EXE_HELPER) + cSize);
     if (Helper == NULL) {
         goto Cleanup;
     }
@@ -1189,7 +1189,7 @@ BOOL WINAPI AllocExeHelper(_Out_ PDETOUR_EXE_HELPER *pHelper,
 
   Cleanup:
     if (Helper != NULL) {
-        delete[] (PBYTE)Helper;
+        DetourDestroyObjectArray((PBYTE)Helper);
         Helper = NULL;
     }
     return Result;
@@ -1199,7 +1199,7 @@ static
 VOID WINAPI FreeExeHelper(PDETOUR_EXE_HELPER *pHelper)
 {
     if (*pHelper != NULL) {
-        delete[] (PBYTE)*pHelper;
+        DetourDestroyObjectArray((PBYTE)*pHelper);
         *pHelper = NULL;
     }
 }