c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

xmlreader: Clean up error handling

Browse Source 
Make sure that xmlTextReaderRead returns -1 immediately if the reader is
in an error state.
This commit is contained in:
Nick Wellnhofer 2023-10-15 13:56:34 +02:00
parent ddda373eb5
commit 13962b06d5
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
xmlreader.c
View File

@ -1142,6 +1142,7 @@ xmlTextReaderDoExpand(xmlTextReaderPtr reader) {
val = xmlTextReaderPushData(reader); val = xmlTextReaderPushData(reader);
if (val < 0){ if (val < 0){
reader->mode = XML_TEXTREADER_MODE_ERROR; reader->mode = XML_TEXTREADER_MODE_ERROR;
reader->state = XML_TEXTREADER_ERROR;
return(-1); return(-1);
} }
} while(reader->mode != XML_TEXTREADER_MODE_EOF); } while(reader->mode != XML_TEXTREADER_MODE_EOF);
@ -1220,6 +1221,8 @@ xmlTextReaderRead(xmlTextReaderPtr reader) {
return(xmlTextReaderReadTree(reader)); return(xmlTextReaderReadTree(reader));
if (reader->ctxt == NULL) if (reader->ctxt == NULL)
return(-1); return(-1);
if (reader->state == XML_TEXTREADER_ERROR)
return(-1);
if (reader->mode == XML_TEXTREADER_MODE_INITIAL) { if (reader->mode == XML_TEXTREADER_MODE_INITIAL) {
reader->mode = XML_TEXTREADER_MODE_INTERACTIVE; reader->mode = XML_TEXTREADER_MODE_INTERACTIVE;
@ -1228,11 +1231,11 @@ xmlTextReaderRead(xmlTextReaderPtr reader) {
*/ */
do { do {
val = xmlTextReaderPushData(reader); val = xmlTextReaderPushData(reader);
if (val < 0){ if (val < 0) {
reader->mode = XML_TEXTREADER_MODE_ERROR; reader->mode = XML_TEXTREADER_MODE_ERROR;
reader->state = XML_TEXTREADER_ERROR; reader->state = XML_TEXTREADER_ERROR;
return(-1); return(-1);
} }
} while ((reader->ctxt->node == NULL) && } while ((reader->ctxt->node == NULL) &&
((reader->mode != XML_TEXTREADER_MODE_EOF) && ((reader->mode != XML_TEXTREADER_MODE_EOF) &&
(reader->state != XML_TEXTREADER_DONE))); (reader->state != XML_TEXTREADER_DONE)));
@ -1240,11 +1243,11 @@ xmlTextReaderRead(xmlTextReaderPtr reader) {
if (reader->ctxt->myDoc != NULL) { if (reader->ctxt->myDoc != NULL) {
reader->node = reader->ctxt->myDoc->children; reader->node = reader->ctxt->myDoc->children;
} }
if (reader->node == NULL){ if (reader->node == NULL) {
reader->mode = XML_TEXTREADER_MODE_ERROR; reader->mode = XML_TEXTREADER_MODE_ERROR;
reader->state = XML_TEXTREADER_ERROR; reader->state = XML_TEXTREADER_ERROR;
return(-1); return(-1);
} }
reader->state = XML_TEXTREADER_ELEMENT; reader->state = XML_TEXTREADER_ELEMENT;
} else { } else {
if (reader->ctxt->myDoc != NULL) { if (reader->ctxt->myDoc != NULL) {
@ -1264,10 +1267,13 @@ xmlTextReaderRead(xmlTextReaderPtr reader) {
get_next_node: get_next_node:
if (reader->node == NULL) { if (reader->node == NULL) {
if (reader->mode == XML_TEXTREADER_MODE_EOF) if (reader->mode == XML_TEXTREADER_MODE_EOF) {
return(0); return(0);
else } else {
reader->mode = XML_TEXTREADER_MODE_ERROR;
reader->state = XML_TEXTREADER_ERROR;
return(-1); return(-1);
}
} }
/* /*
@ -1292,8 +1298,11 @@ get_next_node:
(reader->ctxt->instate != XML_PARSER_EOF) && (reader->ctxt->instate != XML_PARSER_EOF) &&
(PARSER_STOPPED(reader->ctxt) == 0)) { (PARSER_STOPPED(reader->ctxt) == 0)) {
val = xmlTextReaderPushData(reader); val = xmlTextReaderPushData(reader);
if (val < 0) if (val < 0) {
reader->mode = XML_TEXTREADER_MODE_ERROR;
reader->state = XML_TEXTREADER_ERROR;
return(-1); return(-1);
}
if (reader->node == NULL) if (reader->node == NULL)
goto node_end; goto node_end;
} }
@ -1377,8 +1386,11 @@ get_next_node:
if (reader->mode != XML_TEXTREADER_MODE_EOF) { if (reader->mode != XML_TEXTREADER_MODE_EOF) {
val = xmlParseChunk(reader->ctxt, "", 0, 1); val = xmlParseChunk(reader->ctxt, "", 0, 1);
reader->state = XML_TEXTREADER_DONE; reader->state = XML_TEXTREADER_DONE;
if (val != 0) if (val != 0) {
reader->mode = XML_TEXTREADER_MODE_ERROR;
reader->state = XML_TEXTREADER_ERROR;
return(-1); return(-1);
}
} }
reader->node = NULL; reader->node = NULL;
reader->depth = -1; reader->depth = -1;