From a998de110d51139322d1859e08f355b75fa13e8f Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 19 Jun 2017 10:24:03 +0100 Subject: [PATCH] Only re-hook all modules after LoadLibrary if the library loaded * This fixes a problem where if some code is repeatedly doing LoadLibrary for a library that doesn't exist, we'll constantly re-hook everything pointlessly. --- renderdoc/os/win32/win32_hook.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renderdoc/os/win32/win32_hook.cpp b/renderdoc/os/win32/win32_hook.cpp index 3873ca5c6..e3fc5d0d1 100644 --- a/renderdoc/os/win32/win32_hook.cpp +++ b/renderdoc/os/win32/win32_hook.cpp @@ -563,7 +563,7 @@ HMODULE WINAPI Hooked_LoadLibraryExA(LPCSTR lpLibFileName, HANDLE fileHandle, DW DWORD err = GetLastError(); - if(dohook) + if(dohook && mod) HookAllModules(); SetLastError(err); @@ -589,7 +589,7 @@ HMODULE WINAPI Hooked_LoadLibraryExW(LPCWSTR lpLibFileName, HANDLE fileHandle, D DWORD err = GetLastError(); - if(dohook) + if(dohook && mod) HookAllModules(); SetLastError(err);