msxml3/saxreader: Handle NULL interface input in parse().

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msxml3/saxreader: Handle NULL interface input in parse().
ba018b52 · Nikolay Sivov · Alexandre Julliard · a5031391 · ba018b52 · ba018b52
Commit ba018b52 authored Mar 17, 2017 by Nikolay Sivov Committed by Alexandre Julliard Mar 17, 2017
Show whitespace changes
Inline Side-by-side

Showing with 13 additions and 0 deletions

saxreader.c dlls/msxml3/saxreader.c +3 -0

saxreader.c dlls/msxml3/tests/saxreader.c +10 -0

No files found.
--- a/dlls/msxml3/saxreader.c
+++ b/dlls/msxml3/saxreader.c
@@ -2664,6 +2664,9 @@ static HRESULT internal_parse(
            ISequentialStream *stream = NULL;
            IXMLDOMDocument *xmlDoc;

+            if (!V_UNKNOWN(&varInput))
+                return E_INVALIDARG;
+
            if(IUnknown_QueryInterface(V_UNKNOWN(&varInput),
                        &IID_IXMLDOMDocument, (void**)&xmlDoc) == S_OK)
            {

--- a/dlls/msxml3/tests/saxreader.c
+++ b/dlls/msxml3/tests/saxreader.c
@@ -2221,6 +2221,16 @@ static void test_saxreader(void)

        SafeArrayDestroy(sa);

+        V_VT(&var) = VT_UNKNOWN;
+        V_UNKNOWN(&var) = NULL;
+        hr = ISAXXMLReader_parse(reader, var);
+        ok(hr == E_INVALIDARG, "got %#x\n", hr);
+
+        V_VT(&var) = VT_DISPATCH;
+        V_DISPATCH(&var) = NULL;
+        hr = ISAXXMLReader_parse(reader, var);
+        ok(hr == E_INVALIDARG, "got %#x\n", hr);
+
        stream = create_test_stream(testXML, -1);
        V_VT(&var) = VT_UNKNOWN;
        V_UNKNOWN(&var) = (IUnknown*)stream;