Jefferson Carpenter : msxml3: Null check newChild in DOMDocument insertBefore.

Alexandre Julliard julliard at winehq.org
Tue Jun 1 16:04:32 CDT 2021


Module: wine
Branch: master
Commit: ec867bc4287dc900ad5728fcd5b0b87f9a056051
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=ec867bc4287dc900ad5728fcd5b0b87f9a056051

Author: Jefferson Carpenter <jeffersoncarpenter2 at gmail.com>
Date:   Thu May 27 12:36:46 2021 +0000

msxml3: Null check newChild in DOMDocument insertBefore.

Signed-off-by: Jefferson Carpenter <jeffersoncarpenter2 at gmail.com>
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/msxml3/domdoc.c       | 2 ++
 dlls/msxml3/tests/domdoc.c | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
index 45fbd6f43aa..61fbbf9f20b 100644
--- a/dlls/msxml3/domdoc.c
+++ b/dlls/msxml3/domdoc.c
@@ -1210,6 +1210,8 @@ static HRESULT WINAPI domdoc_insertBefore(
 
     TRACE("(%p)->(%p %s %p)\n", This, newChild, debugstr_variant(&refChild), outNewChild);
 
+    if (!newChild) return E_INVALIDARG;
+
     hr = IXMLDOMNode_get_nodeType(newChild, &type);
     if (hr != S_OK) return hr;
 
diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index 12482962c4b..ea8a95252a1 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -9235,6 +9235,13 @@ static void test_insertBefore(void)
     doc = create_document(&IID_IXMLDOMDocument);
     doc3 = create_document(&IID_IXMLDOMDocument);
 
+    /* NULL to document */
+    V_VT(&v) = VT_NULL;
+    node = (void*)0xdeadbeef;
+    hr = IXMLDOMDocument_insertBefore(doc, NULL, v, &node);
+    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+    ok(node == (void*)0xdeadbeef, "got %p\n", node);
+
     /* document to document */
     V_VT(&v) = VT_NULL;
     node = (void*)0xdeadbeef;




More information about the wine-cvs mailing list