ole2: Fix error handling in ReadClassStg().

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ole2: Fix error handling in ReadClassStg().
995fe926 · Nikolay Sivov · Alexandre Julliard · 9608c794 · 995fe926
Commit 995fe926 authored Jan 10, 2016 by Nikolay Sivov Committed by Alexandre Julliard Jan 11, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

ole2.c dlls/ole2.dll16/ole2.c +9 -2

No files found.
--- a/dlls/ole2.dll16/ole2.c
+++ b/dlls/ole2.dll16/ole2.c
@@ -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
 	 */