fix a nasty problem with reading over the end fix a reported memory leak
* xmlreader.c: fix a nasty problem with reading over the end
* xmlsave.c: fix a reported memory leak apparently
Daniel
diff --git a/xmlreader.c b/xmlreader.c
index f175759..75b73ff 100644
--- a/xmlreader.c
+++ b/xmlreader.c
@@ -1179,6 +1179,8 @@
fprintf(stderr, "\nREAD ");
DUMP_READER
#endif
+ if (reader->mode == XML_TEXTREADER_DONE)
+ return(0);
reader->curnode = NULL;
if (reader->mode == XML_TEXTREADER_MODE_INITIAL) {
reader->mode = XML_TEXTREADER_MODE_INTERACTIVE;
@@ -1215,12 +1217,15 @@
oldnode = reader->node;
get_next_node:
+ if (reader->node == NULL)
+ return(-1);
+
/*
* If we are not backtracking on ancestors or examined nodes,
* that the parser didn't finished or that we arent at the end
* of stream, continue processing.
*/
- while ((reader->node->next == NULL) &&
+ while ((reader->node != NULL) && (reader->node->next == NULL) &&
(reader->ctxt->nodeNr == olddepth) &&
((oldstate == XML_TEXTREADER_BACKTRACK) ||
(reader->node->children == NULL) ||