From f40c1ce95d3284cd6d3cbf49b6d4448cc750f3ea Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Fri, 19 Dec 2003 17:26:28 +0000 Subject: [PATCH] trying to fix #129692 xmlTextReaderExpand() when using an * xmlreader.c: trying to fix #129692 xmlTextReaderExpand() when using an xmlReaderWalker() Daniel --- ChangeLog | 12 ++++++++---- xmlreader.c | 4 +++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c99756d5..9941b51b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,13 @@ +Fri Dec 19 18:24:02 CET 2003 Daniel Veillard + + * xmlreader.c: trying to fix #129692 xmlTextReaderExpand() when + using an xmlReaderWalker() + Thu Dec 18 20:10:34 MST 2003 John Fleck - * tree.c fix misc. typos in doc comments - * include/libxml/tree.h elaborate on macro define doc - comments - * doc/* rebuild docs + * tree.c: fix misc. typos in doc comments + * include/libxml/tree.h: elaborate on macro define doc comments + * doc/*: rebuild docs Wed Dec 17 16:07:33 CET 2003 Daniel Veillard diff --git a/xmlreader.c b/xmlreader.c index 485859e6..bfcc0535 100644 --- a/xmlreader.c +++ b/xmlreader.c @@ -1482,10 +1482,12 @@ xmlTextReaderReadState(xmlTextReaderPtr reader) { */ xmlNodePtr xmlTextReaderExpand(xmlTextReaderPtr reader) { - if ((reader == NULL) || (reader->node == NULL) || (reader->ctxt == NULL)) + if ((reader == NULL) || (reader->node == NULL)) return(NULL); if (reader->doc != NULL) return(reader->node); + if (reader->ctxt == NULL) + return(NULL); if (xmlTextReaderDoExpand(reader) < 0) return(NULL); return(reader->node);