Commit 93e76ece authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard

msxml3: oldChild in xmlnode_removeChild may be NULL.

parent 088f3eef
......@@ -625,7 +625,8 @@ static HRESULT WINAPI xmlnode_removeChild(
TRACE("%p->(%p, %p)\n", This, childNode, oldChild);
*oldChild = NULL;
if(oldChild)
*oldChild = NULL;
if(!childNode) return E_INVALIDARG;
......@@ -651,7 +652,9 @@ static HRESULT WINAPI xmlnode_removeChild(
IXMLDOMNode_Release(child);
IXMLDOMNode_AddRef(childNode);
*oldChild = childNode;
if(oldChild)
*oldChild = childNode;
return S_OK;
}
......
......@@ -1769,6 +1769,18 @@ static void test_removeChild(void)
IXMLDOMNode_Release( node2 );
IXMLDOMNode_Release( node4 );
r = IXMLDOMNodeList_get_item( node_list, 0, &node4 );
ok( r == S_OK, "ret %08x\n", r);
r = IXMLDOMElement_removeChild( element, node4, NULL );
ok( r == S_OK, "ret %08x\n", r);
r = IXMLDOMNode_get_parentNode( node4, &node3 );
ok( r == S_FALSE, "ret %08x\n", r);
ok( node3 == NULL, "%p\n", node3 );
IXMLDOMNode_Release( node4 );
IXMLDOMNodeList_Release( node_list2 );
IXMLDOMNode_Release( node );
IXMLDOMNodeList_Release( node_list );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment