Fix crash in xmlnodelist_QueryInterface. Solves CORE-6665.

svn path=/trunk/; revision=57310
This commit is contained in:
Mike Nordell 2012-09-15 21:41:46 +00:00
parent 3248cce92e
commit 7db43aa6a6
2 changed files with 23 additions and 0 deletions

View file

@ -20,3 +20,21 @@ Index: msxml3.spec
@ stdcall -private DllCanUnloadNow()
@ stdcall -private DllGetClassObject(ptr ptr ptr)
Index: nodelist.c
===================================================================
--- nodelist.c (revision 57307)
+++ nodelist.c (working copy)
@@ -87,6 +87,11 @@
TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject);
+ if (!ppvObject)
+ {
+ return E_POINTER;
+ }
+
if ( IsEqualGUID( riid, &IID_IUnknown ) ||
IsEqualGUID( riid, &IID_IDispatch ) ||
IsEqualGUID( riid, &IID_IXMLDOMNodeList ) )

View file

@ -87,6 +87,11 @@ static HRESULT WINAPI xmlnodelist_QueryInterface(
TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject);
if (!ppvObject)
{
return E_POINTER;
}
if ( IsEqualGUID( riid, &IID_IUnknown ) ||
IsEqualGUID( riid, &IID_IDispatch ) ||
IsEqualGUID( riid, &IID_IXMLDOMNodeList ) )