Return an error in CoMarshalInterface if the IUnknown pointer is NULL

and don't crash.

Return an error in CoMarshalInterface if the IUnknown pointer is NULL
665c4880 · Aric Stewart · Alexandre Julliard · 1b2a8190 · 665c4880
Commit 665c4880 authored Jun 30, 2004 by Aric Stewart Committed by Alexandre Julliard Jun 30, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

marshal.c dlls/ole32/marshal.c +4 -0

No files found.
--- a/dlls/ole32/marshal.c
+++ b/dlls/ole32/marshal.c
@@ -453,6 +453,10 @@ CoMarshalInterface( IStream *pStm, REFIID riid, IUnknown *pUnk,
  TRACE("(%p, %s, %p, %lx, %p, %lx)\n",
    pStm,debugstr_guid(riid),pUnk,dwDestContext,pvDestContext,mshlflags
  );
+
+  if (pUnk == NULL)
+    return E_INVALIDARG;
+
  STUBMGR_Start(); /* Just to be sure we have one running. */
  mid.processid = GetCurrentProcessId();
  IUnknown_QueryInterface(pUnk,&IID_IUnknown,(LPVOID*)&pUnknown);