end of first pass on coverity reports. Daniel
* runtest.c schematron.c testAutomata.c tree.c valid.c xinclude.c
xmlcatalog.c xmlreader.c xmlregexp.c xpath.c: end of first
pass on coverity reports.
Daniel
diff --git a/xmlreader.c b/xmlreader.c
index 0bdf071..c8bcf7b 100644
--- a/xmlreader.c
+++ b/xmlreader.c
@@ -1136,7 +1136,7 @@
if (cur->next != NULL) return(cur->next) ;
do {
cur = cur->parent;
- if (cur == NULL) return(NULL);
+ if (cur == NULL) break;
if (cur->next != NULL) return(cur->next);
} while (cur != NULL);
return(cur);
@@ -1469,11 +1469,11 @@
return -1;
xmlXIncludeProcessNode(reader->xincctxt, reader->node);
}
- if (reader->node->type == XML_XINCLUDE_START) {
+ if ((reader->node != NULL) && (reader->node->type == XML_XINCLUDE_START)) {
reader->in_xinclude++;
goto get_next_node;
}
- if (reader->node->type == XML_XINCLUDE_END) {
+ if ((reader->node != NULL) && (reader->node->type == XML_XINCLUDE_END)) {
reader->in_xinclude--;
goto get_next_node;
}