Nikolay Sivov : xmllite/reader: Reset reader nesting depth on error.

Alexandre Julliard julliard at winehq.org
Mon Mar 13 15:40:32 CDT 2017


Module: wine
Branch: master
Commit: 876de4a73d62cfb5e2806a8dfdff76d5c48a0614
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=876de4a73d62cfb5e2806a8dfdff76d5c48a0614

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Mon Mar 13 12:27:55 2017 +0300

xmllite/reader: Reset reader nesting depth on error.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/xmllite/reader.c       | 1 +
 dlls/xmllite/tests/reader.c | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c
index 6379b70..41a6fb8 100644
--- a/dlls/xmllite/reader.c
+++ b/dlls/xmllite/reader.c
@@ -2847,6 +2847,7 @@ static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *nodetype)
         {
             This->state = XmlReadState_Error;
             This->nodetype = XmlNodeType_None;
+            This->depth = 0;
             This->error = hr;
         }
     }
diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c
index d225ab3..8660bb8 100644
--- a/dlls/xmllite/tests/reader.c
+++ b/dlls/xmllite/tests/reader.c
@@ -2402,7 +2402,6 @@ static void test_max_element_depth(void)
     hr = IXmlReader_Read(reader, NULL);
     ok(hr == SC_E_MAXELEMENTDEPTH, "got %08x\n", hr);
 
-todo_wine
     TEST_DEPTH2(reader, 0, 2);
     TEST_READER_STATE(reader, XmlReadState_Error);
 
@@ -2412,7 +2411,6 @@ todo_wine
     hr = IXmlReader_Read(reader, NULL);
     ok(hr == SC_E_MAXELEMENTDEPTH, "got %08x\n", hr);
 
-todo_wine
     TEST_DEPTH2(reader, 0, 2);
     TEST_READER_STATE(reader, XmlReadState_Error);
     IStream_Release(stream);
@@ -2454,7 +2452,6 @@ todo_wine
     ok(hr == SC_E_MAXELEMENTDEPTH, "got %08x\n", hr);
     ok(nodetype == XmlNodeType_None, "got node type %d\n", nodetype);
 
-todo_wine
     TEST_DEPTH2(reader, 0, 2);
     TEST_READER_STATE(reader, XmlReadState_Error);
 




More information about the wine-cvs mailing list