ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shlwapi: Handle NULL pointer in DllGetVersion() (Coverity). 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2015-12-29 01:04:44 +03:00 committed by Alexandre Julliard
parent 57bfebfc80
commit 0e4be06cd6
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/shlwapi/shlwapi_main.c
View File

@ -94,6 +94,9 @@ HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi)
TRACE("(%p)\n",pdvi); TRACE("(%p)\n",pdvi);
if (!pdvi)
return E_INVALIDARG;
switch (pdvi2->info1.cbSize) switch (pdvi2->info1.cbSize)
{ {
case sizeof(DLLVERSIONINFO2): case sizeof(DLLVERSIONINFO2):
@ -107,7 +110,7 @@ HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi)
pdvi2->info1.dwPlatformID = DLLVER_PLATFORM_WINDOWS; pdvi2->info1.dwPlatformID = DLLVER_PLATFORM_WINDOWS;
return S_OK; return S_OK;
} }
if (pdvi)
WARN("pdvi->cbSize = %d, unhandled\n", pdvi2->info1.cbSize); WARN("pdvi->cbSize = %d, unhandled\n", pdvi2->info1.cbSize);
return E_INVALIDARG; return E_INVALIDARG;
} }

12
dlls/shlwapi/tests/ordinal.c
View File

@ -70,6 +70,7 @@ static HRESULT (WINAPI *pSKDeleteValueW)(DWORD, LPCWSTR, LPCWSTR);
static HRESULT (WINAPI *pSKAllocValueW)(DWORD, LPCWSTR, LPCWSTR, DWORD*, void**, DWORD*); static HRESULT (WINAPI *pSKAllocValueW)(DWORD, LPCWSTR, LPCWSTR, DWORD*, void**, DWORD*);
static HWND (WINAPI *pSHSetParentHwnd)(HWND, HWND); static HWND (WINAPI *pSHSetParentHwnd)(HWND, HWND);
static HRESULT (WINAPI *pIUnknown_GetClassID)(IUnknown*, CLSID*); static HRESULT (WINAPI *pIUnknown_GetClassID)(IUnknown*, CLSID*);
static HRESULT (WINAPI *pDllGetVersion)(DLLVERSIONINFO2*);
static HMODULE hmlang; static HMODULE hmlang;
static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT); static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT);
@ -3073,6 +3074,8 @@ static void init_pointers(void)
MAKEFUNC(SKDeleteValueW, 518); MAKEFUNC(SKDeleteValueW, 518);
MAKEFUNC(SKAllocValueW, 519); MAKEFUNC(SKAllocValueW, 519);
#undef MAKEFUNC #undef MAKEFUNC
pDllGetVersion = (void*)GetProcAddress(hShlwapi, "DllGetVersion");
} }
static void test_SHSetParentHwnd(void) static void test_SHSetParentHwnd(void)
@ -3246,6 +3249,14 @@ if (0) /* crashes on native systems */
"got wrong clsid %s\n", wine_dbgstr_guid(&clsid)); "got wrong clsid %s\n", wine_dbgstr_guid(&clsid));
} }
static void test_DllGetVersion(void)
{
HRESULT hr;
hr = pDllGetVersion(NULL);
ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
}
START_TEST(ordinal) START_TEST(ordinal)
{ {
char **argv; char **argv;
@ -3301,6 +3312,7 @@ START_TEST(ordinal)
test_SHGetShellKey(); test_SHGetShellKey();
test_SHSetParentHwnd(); test_SHSetParentHwnd();
test_IUnknown_GetClassID(); test_IUnknown_GetClassID();
test_DllGetVersion();
FreeLibrary(hshell32); FreeLibrary(hshell32);
FreeLibrary(hmlang); FreeLibrary(hmlang);