Skip to content

W
wine-winehq
Commit 665c4880 authored by Aric Stewart's avatar Aric Stewart Committed by Alexandre Julliard
Browse files
Options

Return an error in CoMarshalInterface if the IUnknown pointer is NULL

and don't crash.
parent 1b2a8190
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
dlls/ole32/marshal.c
View file @ 665c4880
...@@ -453,6 +453,10 @@ CoMarshalInterface( IStream *pStm, REFIID riid, IUnknown *pUnk, ...@@ -453,6 +453,10 @@ CoMarshalInterface( IStream *pStm, REFIID riid, IUnknown *pUnk,
TRACE("(%p, %s, %p, %lx, %p, %lx)\n", TRACE("(%p, %s, %p, %lx, %p, %lx)\n",
pStm,debugstr_guid(riid),pUnk,dwDestContext,pvDestContext,mshlflags pStm,debugstr_guid(riid),pUnk,dwDestContext,pvDestContext,mshlflags
); );
if (pUnk == NULL)
return E_INVALIDARG;
STUBMGR_Start(); /* Just to be sure we have one running. */ STUBMGR_Start(); /* Just to be sure we have one running. */
mid.processid = GetCurrentProcessId(); mid.processid = GetCurrentProcessId();
IUnknown_QueryInterface(pUnk,&IID_IUnknown,(LPVOID*)&pUnknown); IUnknown_QueryInterface(pUnk,&IID_IUnknown,(LPVOID*)&pUnknown);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment