Nikolay Sivov : msxml3: Fix ::selectSingleNode() behaviour on invalid arguments.
Alexandre Julliard
julliard at winehq.org
Sat Sep 18 07:42:19 CDT 2010
Module: wine
Branch: master
Commit: a930084d8664b3c3dacf7c04f2cadcc6766e0cf6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a930084d8664b3c3dacf7c04f2cadcc6766e0cf6
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Thu Sep 16 23:41:00 2010 +0400
msxml3: Fix ::selectSingleNode() behaviour on invalid arguments.
---
dlls/msxml3/node.c | 3 +-
dlls/msxml3/tests/domdoc.c | 69 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 71 insertions(+), 1 deletions(-)
diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c
index 8f3ebc6..d466780 100644
--- a/dlls/msxml3/node.c
+++ b/dlls/msxml3/node.c
@@ -1363,6 +1363,8 @@ static HRESULT WINAPI xmlnode_selectNodes(
TRACE("(%p)->(%s %p)\n", This, debugstr_w(queryString), resultList );
+ if (!queryString || !resultList) return E_INVALIDARG;
+
return queryresult_create( This->node, queryString, resultList );
}
@@ -1377,7 +1379,6 @@ static HRESULT WINAPI xmlnode_selectSingleNode(
TRACE("(%p)->(%s %p)\n", This, debugstr_w(queryString), resultNode );
- *resultNode = NULL;
r = IXMLDOMNode_selectNodes(This->iface, queryString, &list);
if(r == S_OK)
{
diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index f68c972..fc09f15 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -6218,6 +6218,74 @@ static void test_get_prefix(void)
free_bstrs();
}
+static void test_selectSingleNode(void)
+{
+ IXMLDOMDocument *doc;
+ IXMLDOMNodeList *list;
+ IXMLDOMNode *node;
+ VARIANT_BOOL b;
+ HRESULT hr;
+ LONG len;
+ BSTR str;
+
+ doc = create_document(&IID_IXMLDOMDocument);
+ if (!doc) return;
+
+ hr = IXMLDOMDocument_selectSingleNode(doc, NULL, NULL);
+ ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+
+ hr = IXMLDOMDocument_selectNodes(doc, NULL, NULL);
+ ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+
+ str = SysAllocString( szComplete4 );
+ hr = IXMLDOMDocument_loadXML( doc, str, &b );
+ ok( hr == S_OK, "loadXML failed\n");
+ ok( b == VARIANT_TRUE, "failed to load XML string\n");
+ SysFreeString( str );
+
+ hr = IXMLDOMDocument_selectSingleNode(doc, NULL, NULL);
+ ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+
+ hr = IXMLDOMDocument_selectNodes(doc, NULL, NULL);
+ ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+
+ hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("lc"), NULL);
+ ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+
+ hr = IXMLDOMDocument_selectNodes(doc, _bstr_("lc"), NULL);
+ ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+
+ hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("lc"), &node);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+ IXMLDOMNode_Release(node);
+
+ hr = IXMLDOMDocument_selectNodes(doc, _bstr_("lc"), &list);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+ IXMLDOMNodeList_Release(list);
+
+ list = (void*)0xdeadbeef;
+ hr = IXMLDOMDocument_selectNodes(doc, NULL, &list);
+ ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+ ok(list == (void*)0xdeadbeef, "got %p\n", list);
+
+ node = (void*)0xdeadbeef;
+ hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("nonexistent"), &node);
+ ok(hr == S_FALSE, "got 0x%08x\n", hr);
+ ok(node == 0, "got %p\n", node);
+
+ list = (void*)0xdeadbeef;
+ hr = IXMLDOMDocument_selectNodes(doc, _bstr_("nonexistent"), &list);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+ len = 1;
+ hr = IXMLDOMNodeList_get_length(list, &len);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(len == 0, "got %d\n", len);
+ IXMLDOMNodeList_Release(list);
+
+ IXMLDOMDocument_Release(doc);
+ free_bstrs();
+}
+
START_TEST(domdoc)
{
IXMLDOMDocument *doc;
@@ -6276,6 +6344,7 @@ START_TEST(domdoc)
test_createNode();
test_get_prefix();
test_default_properties();
+ test_selectSingleNode();
CoUninitialize();
}
More information about the wine-cvs
mailing list