[libxml2] Fix Enum check and missing break



commit d319eb922358754f0601ddde97e8f09449477d00
Author: Gaurav Gupta <g gupta samsung com>
Date:   Mon Oct 6 12:24:17 2014 +0800

    Fix Enum check and missing break
    
    for https://bugzilla.gnome.org/show_bug.cgi?id=737403
    
    In file xmlreader.c
    1. An enum is checked to proper value instead of checking like a boolean.
    2. Missing break statement added.

 xmlreader.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/xmlreader.c b/xmlreader.c
index c5b683d..2607a70 100644
--- a/xmlreader.c
+++ b/xmlreader.c
@@ -1431,7 +1431,7 @@ get_next_node:
        goto node_found;
     }
 #ifdef LIBXML_REGEXP_ENABLED
-    if ((reader->validate) && (reader->node->type == XML_ELEMENT_NODE))
+    if ((reader->validate != XML_TEXTREADER_NOT_VALIDATE) && (reader->node->type == XML_ELEMENT_NODE))
        xmlTextReaderValidatePop(reader);
 #endif /* LIBXML_REGEXP_ENABLED */
     if ((reader->preserves > 0) &&
@@ -1564,7 +1564,7 @@ node_found:
         goto get_next_node;
     }
 #ifdef LIBXML_REGEXP_ENABLED
-    if ((reader->validate) && (reader->node != NULL)) {
+    if ((reader->validate != XML_TEXTREADER_NOT_VALIDATE) && (reader->node != NULL)) {
        xmlNodePtr node = reader->node;
 
        if ((node->type == XML_ELEMENT_NODE) &&
@@ -1794,6 +1794,7 @@ xmlTextReaderReadString(xmlTextReaderPtr reader)
        if (xmlTextReaderDoExpand(reader) != -1) {
            return xmlTextReaderCollectSiblings(node->children);
        }
+       break;
     case XML_ATTRIBUTE_NODE:
        TODO
        break;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]