Module: wine Branch: master Commit: 7730e1408ff33dba394ff078b624e3043a557c1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7730e1408ff33dba394ff078b6...
Author: Rob Shearman rob@codeweavers.com Date: Tue Jan 9 17:17:24 2007 +0000
ole32: Return an error from CoUnmarshalInterface if pStream is NULL or if ppv is NULL.
---
dlls/ole32/marshal.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 4294cb5..3708f50 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1659,6 +1659,9 @@ HRESULT WINAPI CoUnmarshalInterface(IStr
TRACE("(%p, %s, %p)\n", pStream, debugstr_guid(riid), ppv);
+ if (!pStream || !ppv) + return E_INVALIDARG; + hr = get_unmarshaler_from_stream(pStream, &pMarshal, &iid); if (hr != S_OK) return hr;