From bc2f45508d33c50a23ccd5668ac82f673fec3a83 Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Fri, 26 May 2017 10:49:42 -0500 Subject: [PATCH] Fix dllHandle possibly being uninitialized in Sys_LoadDll --- code/sys/sys_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/sys/sys_main.c b/code/sys/sys_main.c index 14179b90..b559861b 100644 --- a/code/sys/sys_main.c +++ b/code/sys/sys_main.c @@ -498,7 +498,7 @@ from executable path, then fs_basepath. void *Sys_LoadDll(const char *name, qboolean useSystemLib) { - void *dllhandle; + void *dllhandle = NULL; if(!Sys_DllExtension(name)) { @@ -507,9 +507,12 @@ void *Sys_LoadDll(const char *name, qboolean useSystemLib) } if(useSystemLib) + { Com_Printf("Trying to load \"%s\"...\n", name); + dllhandle = Sys_LoadLibrary(name); + } - if(!useSystemLib || !(dllhandle = Sys_LoadLibrary(name))) + if(!dllhandle) { const char *topDir; char libPath[MAX_OSPATH];