From 20e86183bf29bdc7a98d890a590d35e6a1faa4c7 Mon Sep 17 00:00:00 2001 From: baldurk Date: Sun, 5 Oct 2014 16:32:30 +0100 Subject: [PATCH] [Refs #87: Static Analysis] Handle NULL parameters separately --- renderdoc/os/win32/win32_hook.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/renderdoc/os/win32/win32_hook.cpp b/renderdoc/os/win32/win32_hook.cpp index 20902bd3c..917f7dff2 100644 --- a/renderdoc/os/win32/win32_hook.cpp +++ b/renderdoc/os/win32/win32_hook.cpp @@ -310,7 +310,10 @@ static bool OrdinalAsString(void *func) FARPROC WINAPI Hooked_GetProcAddress(HMODULE mod, LPCSTR func) { - if(mod == s_HookData->module || mod == NULL || func == NULL || OrdinalAsString((void *)func)) + if(mod == NULL || func == NULL) + return (FARPROC)NULL; + + if(mod == s_HookData->module || OrdinalAsString((void *)func)) return GetProcAddress(mod, func); for(auto it=s_HookData->DllHooks.begin(); it != s_HookData->DllHooks.end(); ++it)