[PATCH] msxml3: move element usage into element!=NULL check (Coverity)

Marcus Meissner marcus at jet.franken.de
Wed Nov 25 03:14:47 CST 2009


Hi,

Coverity thinks the code should be reordered a bit to where
element cannot be NULL.

Moved a bit of code, removed shadowing "node" variable too.

Ciao, Marcus
---
 dlls/msxml3/tests/domdoc.c |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index 43a90d7..a5b207a 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -1316,7 +1316,6 @@ todo_wine
     /* now traverse the tree from the root element */
     if (element)
     {
-        IXMLDOMNode *node;
         r = IXMLDOMNode_get_childNodes( element, &list );
         ok( r == S_OK, "get_childNodes returned wrong code\n");
 
@@ -1332,19 +1331,19 @@ todo_wine
         IXMLDOMNodeList_AddRef(list);
         expect_list_and_release(list, "E1.E2.D1 E2.E2.D1 E3.E2.D1 E4.E2.D1");
         ole_check(IXMLDOMNodeList_reset(list));
+
+        node = (void*)0xdeadbeef;
+        r = IXMLDOMNode_selectSingleNode( element, szdl, &node );
+        ok( r == S_FALSE, "ret %08x\n", r );
+        ok( node == NULL, "node %p\n", node );
+        r = IXMLDOMNode_selectSingleNode( element, szbs, &node );
+        ok( r == S_OK, "ret %08x\n", r );
+        r = IXMLDOMNode_Release( node );
+        ok( r == 0, "ret %08x\n", r );
     }
     else
         ok( FALSE, "no element\n");
 
-    node = (void*)0xdeadbeef;
-    r = IXMLDOMNode_selectSingleNode( element, szdl, &node );
-    ok( r == S_FALSE, "ret %08x\n", r );
-    ok( node == NULL, "node %p\n", node );
-    r = IXMLDOMNode_selectSingleNode( element, szbs, &node );
-    ok( r == S_OK, "ret %08x\n", r );
-    r = IXMLDOMNode_Release( node );
-    ok( r == 0, "ret %08x\n", r );
-
     if (list)
     {
         r = IXMLDOMNodeList_QueryInterface(list, &IID_IDispatch, NULL);
-- 
1.5.6



More information about the wine-patches mailing list