Nikolay Sivov : xmllite: Reset resume state when text node is parsed.

Alexandre Julliard julliard at winehq.org
Mon Sep 30 16:07:54 CDT 2013


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

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Sun Sep 29 18:52:47 2013 +0400

xmllite: Reset resume state when text node is parsed.

---

 dlls/xmllite/reader.c       |    2 ++
 dlls/xmllite/tests/reader.c |    4 ++++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c
index e193e9d..325a7a5 100644
--- a/dlls/xmllite/reader.c
+++ b/dlls/xmllite/reader.c
@@ -2226,6 +2226,8 @@ static HRESULT reader_parse_chardata(xmlreader *reader)
 
             reader_init_strvalue(start, ptr-start, &value);
             reader_set_strvalue(reader, StringValue_Value, &value);
+            reader->resume[XmlReadResume_Body] = NULL;
+            reader->resumestate = XmlReadResumeState_Initial;
             return S_OK;
         }
 
diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c
index d7400bc..04761cb 100644
--- a/dlls/xmllite/tests/reader.c
+++ b/dlls/xmllite/tests/reader.c
@@ -944,7 +944,9 @@ static const char misc_test_xml[] =
     "<!-- comment4 -->"
     "<a>"
     "<b/>"
+    "text"
     "<!-- comment -->"
+    "text2"
     "<?pi pibody ?>"
     "</a>"
 ;
@@ -960,7 +962,9 @@ static struct nodes_test misc_test = {
         XmlNodeType_Comment,
         XmlNodeType_Element,
         XmlNodeType_Element,
+        XmlNodeType_Text,
         XmlNodeType_Comment,
+        XmlNodeType_Text,
         XmlNodeType_ProcessingInstruction,
         XmlNodeType_EndElement,
         XmlNodeType_None




More information about the wine-cvs mailing list