[ros-diffs] [mnordell] 57310: Fix crash in xmlnodelist_QueryInterface. Solves CORE-6665.

Author: mnordell
Date: Sat Sep 15 21:41:46 2012
New Revision: 57310

URL: http://svn.reactos.org/svn/reactos?rev=57310&view=rev
Log:
Fix crash in xmlnodelist_QueryInterface. Solves CORE-6665.

Modified:
    trunk/reactos/dll/win32/msxml3/msxml3_ros.diff
    trunk/reactos/dll/win32/msxml3/nodelist.c

Modified: trunk/reactos/dll/win32/msxml3/msxml3_ros.diff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml3_ro…
==============================================================================
--- trunk/reactos/dll/win32/msxml3/msxml3_ros.diff [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msxml3/msxml3_ros.diff [iso-8859-1] Sat Sep 15 21:41:46 2012
@@ -20,3 +20,21 @@
  
  @ 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 ) )

Modified: trunk/reactos/dll/win32/msxml3/nodelist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/nodelist.…
==============================================================================
--- trunk/reactos/dll/win32/msxml3/nodelist.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msxml3/nodelist.c [iso-8859-1] Sat Sep 15 21:41:46 2012
@@ -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 ) )