From 87653bf780996e1e41a259c78c339c7f23028e69 Mon Sep 17 00:00:00 2001 From: rtldg <55846624+rtldg@users.noreply.github.com> Date: Fri, 28 Feb 2025 20:33:55 +0000 Subject: [PATCH] Fix a DHook crash when unloading dynamic detours on x86_64 arch (#2288) --- extensions/dhooks/DynamicHooks/hook.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/extensions/dhooks/DynamicHooks/hook.cpp b/extensions/dhooks/DynamicHooks/hook.cpp index 4bbb59a92..4454ea37f 100644 --- a/extensions/dhooks/DynamicHooks/hook.cpp +++ b/extensions/dhooks/DynamicHooks/hook.cpp @@ -88,10 +88,13 @@ CHook::~CHook() m_Hook.disable(); } + // x64 will free these in the m_bridge/m_postCallback destructors. +#ifndef DYNAMICHOOKS_x86_64 if (m_pBridge) { smutils->GetScriptingEngine()->FreePageMemory(m_pBridge); smutils->GetScriptingEngine()->FreePageMemory(m_pNewRetAddr); } +#endif delete m_pRegisters; delete m_pCallingConvention;