From a1f4744dcf5761bef275e025a8b2ca3ddc287db4 Mon Sep 17 00:00:00 2001 From: Silent Date: Mon, 10 Apr 2017 12:32:31 +0200 Subject: [PATCH] memory validator --- SilentPatchSA/SilentPatchSA.cpp | 114 ++++++++++++++++++++++++++++++++ SilentPatchSA/StdAfxSA.h | 6 ++ 2 files changed, 120 insertions(+) diff --git a/SilentPatchSA/SilentPatchSA.cpp b/SilentPatchSA/SilentPatchSA.cpp index 205667e..545babd 100644 --- a/SilentPatchSA/SilentPatchSA.cpp +++ b/SilentPatchSA/SilentPatchSA.cpp @@ -1124,6 +1124,116 @@ CVehicleModelInfo* __fastcall VehicleModelInfoCtor(CVehicleModelInfo* me) return me; } +#if MEM_VALIDATORS + +#include + +// Validator for static allocations +void PutStaticValidator( uintptr_t begin, uintptr_t end ) +{ + uint8_t* a = (uint8_t*)begin; + uint8_t* b = (uint8_t*)end; + + std::fill( a, b, uint8_t(0xCC) ); +} + +void* malloc_validator(size_t size) +{ + return _malloc_dbg( size, _NORMAL_BLOCK, "EXE", (uintptr_t)_ReturnAddress() ); +} + +void* realloc_validator(void* ptr, size_t size) +{ + return _realloc_dbg( ptr, size, _NORMAL_BLOCK, "EXE", (uintptr_t)_ReturnAddress() ); +} + +void* calloc_validator(size_t count, size_t size) +{ + return _calloc_dbg( count, size, _NORMAL_BLOCK, "EXE", (uintptr_t)_ReturnAddress() ); +} + +void free_validator(void* ptr) +{ + _free_dbg(ptr, _NORMAL_BLOCK); +} + +size_t _msize_validator(void* ptr) +{ + return _msize_dbg(ptr, _NORMAL_BLOCK); +} + +void* _new(size_t size) +{ + return _malloc_dbg( size, _NORMAL_BLOCK, "EXE", (uintptr_t)_ReturnAddress() ); +} + +void _delete(void* ptr) +{ + _free_dbg(ptr, _NORMAL_BLOCK); +} + +class CDebugMemoryMgr +{ +public: + static void* Malloc(size_t size) + { + return _malloc_dbg( size, _NORMAL_BLOCK, "EXE", (uintptr_t)_ReturnAddress() ); + } + + static void Free(void* ptr) + { + _free_dbg(ptr, _NORMAL_BLOCK); + } + + static void* Realloc(void* ptr, size_t size) + { + return _realloc_dbg( ptr, size, _NORMAL_BLOCK, "EXE", (uintptr_t)_ReturnAddress() ); + } + + static void* Calloc(size_t count, size_t size) + { + return _calloc_dbg( count, size, _NORMAL_BLOCK, "EXE", (uintptr_t)_ReturnAddress() ); + } + + static void* MallocAlign(size_t size, size_t align) + { + return _aligned_malloc_dbg( size, align, "EXE", (uintptr_t)_ReturnAddress() ); + } + + static void AlignedFree(void* ptr) + { + _aligned_free_dbg(ptr); + } +}; + +void InstallMemValidator() +{ + using namespace Memory; + + // TEST: Validate memory + InjectHook( 0x824257, malloc_validator, PATCH_JUMP ); + InjectHook( 0x824269, realloc_validator, PATCH_JUMP ); + InjectHook( 0x824416, calloc_validator, PATCH_JUMP ); + InjectHook( 0x82413F, free_validator, PATCH_JUMP ); + InjectHook( 0x828C4A, _msize_validator, PATCH_JUMP ); + + InjectHook( 0x82119A, _new, PATCH_JUMP ); + InjectHook( 0x8214BD, _delete, PATCH_JUMP ); + + InjectHook( 0x72F420, &CDebugMemoryMgr::Malloc, PATCH_JUMP ); + InjectHook( 0x72F430, &CDebugMemoryMgr::Free, PATCH_JUMP ); + InjectHook( 0x72F440, &CDebugMemoryMgr::Realloc, PATCH_JUMP ); + InjectHook( 0x72F460, &CDebugMemoryMgr::Calloc, PATCH_JUMP ); + InjectHook( 0x72F4C0, &CDebugMemoryMgr::MallocAlign, PATCH_JUMP ); + InjectHook( 0x72F4F0, &CDebugMemoryMgr::AlignedFree, PATCH_JUMP ); + + + PutStaticValidator( 0xAAE950, 0xB4C310 ); // CStore + PutStaticValidator( 0xA9AE00, 0xA9AE58 ); // fx_c +} + +#endif + #pragma warning(push) #pragma warning(disable:4838) #include @@ -2811,6 +2921,10 @@ void Patch_SA_10() { using namespace Memory; +#if MEM_VALIDATORS + InstallMemValidator(); +#endif + // IsAlreadyRunning needs to be read relatively late - the later, the better int pIsAlreadyRunning = AddressByRegion_10(0x74872D); ReadCall( pIsAlreadyRunning, IsAlreadyRunning ); diff --git a/SilentPatchSA/StdAfxSA.h b/SilentPatchSA/StdAfxSA.h index cb44827..b0d9ecd 100644 --- a/SilentPatchSA/StdAfxSA.h +++ b/SilentPatchSA/StdAfxSA.h @@ -33,3 +33,9 @@ extern unsigned char& nGameClockDays; extern unsigned char& nGameClockMonths; #define DISABLE_FLA_DONATION_WINDOW 0 + +#ifdef NDEBUG +#define MEM_VALIDATORS 0 +#else +#define MEM_VALIDATORS 1 +#endif