From: Zhenbo Li Subject: msxml3: Handle NULL parameter in IXMLDOMElement::get_ownerDocument(). Message-Id: <55A4FBE0.6090606@gmail.com> Date: Tue, 14 Jul 2015 20:09:04 +0800 --- dlls/msxml3/element.c | 2 ++ dlls/msxml3/tests/domdoc.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 38d3b47..16ce3e9 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -372,6 +372,8 @@ static HRESULT WINAPI domelem_get_ownerDocument( { domelem *This = impl_from_IXMLDOMElement( iface ); TRACE("(%p)->(%p)\n", This, doc); + if(!doc) + return E_INVALIDARG; return node_get_owner_doc(&This->node, doc); } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index f7f57ac..282ceb4 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1901,6 +1901,9 @@ static void test_domnode( void ) if (element) { + r = IXMLDOMElement_get_ownerDocument( element, NULL ); + ok( r == E_INVALIDARG, "got %08x, expected E_INVALIDARG\n", r); + owner = NULL; r = IXMLDOMElement_get_ownerDocument( element, &owner ); ok( r == S_OK, "get_ownerDocument return code\n");