mirror of
https://gitlab.gnome.org/GNOME/libxml2.git
synced 2025-03-19 14:50:07 +03:00
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.
This commit is contained in:
parent
21699937b0
commit
d319eb9223
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user