Nikolay Sivov : msxml3: Protect from null pointer in load().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 13d95525c3f6886f29df658b2d03a415abcbf5e4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=13d95525c3f6886f29df658b2d...

Author: Nikolay Sivov 
Date:   Sat Jul 14 22:52:35 2012 +0400

msxml3: Protect from null pointer in load().

---

dlls/msxml3/domdoc.c       |    1 +
 dlls/msxml3/tests/domdoc.c |    7 +++++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
index cbbebf2..0f3eb50 100644
--- a/dlls/msxml3/domdoc.c
+++ b/dlls/msxml3/domdoc.c
@@ -2093,6 +2093,7 @@ static HRESULT WINAPI domdoc_load(
         }
         break;
     case VT_UNKNOWN:
+        if (!V_UNKNOWN(&source)) return E_INVALIDARG;
         hr = IUnknown_QueryInterface(V_UNKNOWN(&source), &IID_IXMLDOMDocument3, (void**)&pNewDoc);
         if(hr == S_OK)
         {
diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index 46b628f..dfa6126 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -10749,6 +10749,13 @@ static void test_load(void)

doc = create_document(&IID_IXMLDOMDocument);

+    /* null pointer as input */
+    V_VT(&src) = VT_UNKNOWN;
+    V_UNKNOWN(&src) = NULL;
+    hr = IXMLDOMDocument_load(doc, src, &b);
+    EXPECT_HR(hr, E_INVALIDARG);
+    ok(b == VARIANT_FALSE, "got %d\n", b);
+
     path = _bstr_("test.xml");

/* load from path: VT_BSTR */