Fixes

Author: RenardDev

Detours.cpp

@@ -5545,6 +5545,21 @@ namespace Detours {
 			return false;
 		};
 
+		// ----------------------------------------------------------------
+		// __is_range_in_range
+		// ----------------------------------------------------------------
+
+		static bool inline __is_range_in_range(void const* const pOuterRangeStart, const size_t unOuterRangeSize, void const* const pInnerRangeStart, const size_t unInnerRangeSize) {
+			if (!pOuterRangeStart || !pInnerRangeStart) {
+				return false;
+			}
+
+			const char* const pOuterRangeEnd = static_cast<const char* const>(pOuterRangeStart) + unOuterRangeSize;
+			const char* const pInnerRangeEnd = static_cast<const char* const>(pInnerRangeStart) + unInnerRangeSize;
+
+			return (pInnerRangeStart < pOuterRangeEnd) && (pOuterRangeStart < pInnerRangeEnd);
+		}
+
 		// ----------------------------------------------------------------
 		// Shared
 		// ----------------------------------------------------------------
@@ -84837,17 +84852,6 @@ namespace Detours {
 				return false;
 			}
 
-			for (auto& pRecord : g_MemoryHookRecords) {
-				if (pRecord->m_bPendingDeletion) {
-					continue;
-				}
-
-				if (pRecord->m_pCallBack == pCallBack) {
-					g_Suspender.Resume();
-					return false;
-				}
-			}
-
 			auto vecPages = __get_pages_info(pAddress, unSize, true);
 			if (vecPages.empty()) {
 				g_Suspender.Resume();
@@ -84871,6 +84875,36 @@ namespace Detours {
 				return false;
 			}
 
+			for (auto& pRecord : g_MemoryHookRecords) {
+				if (pRecord->m_bPendingDeletion) {
+					continue;
+				}
+
+				if (pRecord->m_pCallBack == pCallBack) {
+					g_Suspender.Resume();
+					return false;
+				}
+
+				if (__is_range_in_range(pRecord->m_pAddress, pRecord->m_unSize, pAddress, unSize)) {
+					g_Suspender.Resume();
+					return false;
+				}
+
+				auto vecRecordPages = __get_pages_info(pRecord->m_pAddress, pRecord->m_unSize, true);
+				if (vecRecordPages.empty()) {
+					continue;
+				}
+
+				for (const auto& pPage : vecPages) {
+					for (const auto& pRecordPage : vecRecordPages) {
+						if (__is_range_in_range(pRecordPage.m_pBaseAddress, pRecordPage.m_unSize, pPage.m_pBaseAddress, pPage.m_unSize)) {
+							g_Suspender.Resume();
+							return false;
+						}
+					}
+				}
+			}
+
 			auto pRecord = std::make_unique<MEMORY_HOOK_RECORD>();
 			if (!pRecord) {
 				g_Suspender.Resume();

main.cpp

@@ -1558,7 +1558,7 @@ TEST_SUITE("Detours::Hook") {
 	void HardwareHook(const PCONTEXT pCTX) {
 		UNREFERENCED_PARAMETER(pCTX);
 
-		_tprintf_s(_T("Mem access! TID=%lu\n"), GetCurrentThreadId());
+		//_tprintf_s(_T("Mem access! TID=%lu\n"), GetCurrentThreadId());
 	}
 
 	void HardwareSelfUnHook(const PCONTEXT pCTX) {
@@ -1899,6 +1899,7 @@ TEST_SUITE("Detours::Hook") {
 		CHECK(hThread != INVALID_HANDLE_VALUE);
 
 		CHECK(Detours::Hook::HookMemory(MemoryHook, pArray, sizeof(int) * 3) == true);
+		CHECK(Detours::Hook::HookMemory(MemoryHook, pArray, sizeof(int) * 3) == false);
 
 		pArray[0] = 0xDEEDBEEF;
 		pArray[1] = 0xDEEDFACE;
@@ -1932,6 +1933,7 @@ TEST_SUITE("Detours::Hook") {
 		CHECK(hThread2 != INVALID_HANDLE_VALUE);
 
 		CHECK(Detours::Hook::HookMemory(MemoryHook, pArray, sizeof(int) * 3) == true);
+		CHECK(Detours::Hook::HookMemory(MemoryHook, pArray, sizeof(int) * 3) == false);
 
 		pArray[0] = 0xDEEDBEEF;
 		pArray[1] = 0xDEEDFACE;
@@ -1965,6 +1967,7 @@ TEST_SUITE("Detours::Hook") {
 		printf("pArray[4] = %i\n", pArray[4]);
 
 		CHECK(Detours::Hook::HookMemory(MemoryHookSelfUnHook, pArray, sizeof(int) * 3) == true);
+		CHECK(Detours::Hook::HookMemory(MemoryHookSelfUnHook, pArray, sizeof(int) * 3) == false);
 
 		printf("pArray[2] = %i\n", pArray[2]);
 		printf("pArray[3] = %i\n", pArray[3]);