marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ole2: Fix error handling in ReadClassStg(). 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Nikolay Sivov 2016-01-10 21:45:48 +03:00 committed by Alexandre Julliard
parent 9608c794c9
commit 995fe92652
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/ole2.dll16/ole2.c
View File

@ -46,6 +46,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(ole);
#define E_INVALIDARG16 MAKE_SCODE(SEVERITY_ERROR, FACILITY_NULL, 3)
static HICON convert_icon_to_32( HICON16 icon16 )
{
@ -296,8 +297,14 @@ HRESULT WINAPI ReadClassStg16(SEGPTR pstg, CLSID *pclsid)
TRACE("(%x, %p)\n", pstg, pclsid);
if(pclsid==NULL)
return E_POINTER;
if (!pclsid)
return E_INVALIDARG16;
memset(pclsid, 0, sizeof(*pclsid));
if (!pstg)
return E_INVALIDARG16;
/*
* read a STATSTG structure (contains the clsid) from the storage
*/