[APPHELP] Dereference after null check (default_dir). CID 1363509

svn path=/trunk/; revision=71931
This commit is contained in:
Mark Jansen 2016-07-13 18:02:16 +00:00
parent 02da519230
commit 3fe36f5bb9

View file

@ -472,6 +472,10 @@ BOOL WINAPI SdbGetAppPatchDir(HSDB db, LPWSTR path, DWORD size)
static WCHAR* default_dir = NULL; static WCHAR* default_dir = NULL;
static CONST WCHAR szAppPatch[] = {'\\','A','p','p','P','a','t','c','h',0}; static CONST WCHAR szAppPatch[] = {'\\','A','p','p','P','a','t','c','h',0};
/* In case function fails, path holds empty string */
if (size > 0)
*path = 0;
if (!default_dir) if (!default_dir)
{ {
WCHAR* tmp = NULL; WCHAR* tmp = NULL;
@ -491,11 +495,12 @@ BOOL WINAPI SdbGetAppPatchDir(HSDB db, LPWSTR path, DWORD size)
if (tmp) if (tmp)
SdbFree(tmp); SdbFree(tmp);
} }
if (!default_dir)
{
SHIM_ERR("Unable to obtain default AppPatch directory\n");
return FALSE;
}
} }
/* In case function fails, path holds empty string */
if (size > 0)
*path = 0;
if (!db) if (!db)
{ {