ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msxml3: Don't try to use null interface pointer.

This commit is contained in:
Nikolay Sivov 2011-10-22 21:22:05 +04:00 committed by Alexandre Julliard
parent 762aa854ca
commit ae6ea94bb3
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/msxml3/node.c
View File

@ -311,8 +311,11 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT
case VT_UNKNOWN:
case VT_DISPATCH:
hr = IUnknown_QueryInterface(V_UNKNOWN(ref_child), &IID_IXMLDOMNode, (void**)&before);
if(FAILED(hr)) return hr;
if (V_UNKNOWN(ref_child))
{
hr = IUnknown_QueryInterface(V_UNKNOWN(ref_child), &IID_IXMLDOMNode, (void**)&before);
if(FAILED(hr)) return hr;
}
break;
default:

20
dlls/msxml3/tests/domdoc.c
View File

@ -9341,12 +9341,32 @@ static void test_insertBefore(void)
hr = IXMLDOMDocument_createElement(doc, _bstr_("elem3"), &elem3);
ok(hr == S_OK, "got 0x%08x\n", hr);
hr = IXMLDOMDocument_createElement(doc, _bstr_("elem3"), &elem3);
ok(hr == S_OK, "got 0x%08x\n", hr);
hr = IXMLDOMDocument_createElement(doc, _bstr_("elem4"), &elem4);
ok(hr == S_OK, "got 0x%08x\n", hr);
EXPECT_NO_CHILDREN(elem1);
EXPECT_NO_CHILDREN(elem2);
EXPECT_NO_CHILDREN(elem3);
todo_wine EXPECT_REF(elem2, 2);
V_VT(&v) = VT_DISPATCH;
V_DISPATCH(&v) = NULL;
node = NULL;
hr = IXMLDOMElement_insertBefore(elem1, (IXMLDOMNode*)elem4, v, &node);
ok(hr == S_OK, "got 0x%08x\n", hr);
ok(node == (void*)elem4, "got %p\n", node);
EXPECT_CHILDREN(elem1);
hr = IXMLDOMElement_removeChild(elem1, (IXMLDOMNode*)elem4, NULL);
EXPECT_HR(hr, S_OK);
IXMLDOMElement_Release(elem4);
EXPECT_NO_CHILDREN(elem1);
V_VT(&v) = VT_NULL;
node = NULL;
hr = IXMLDOMElement_insertBefore(elem1, (IXMLDOMNode*)elem2, v, &node);