lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2026-01-26 21:41:34 +03:00
Code Activity

parser: Make sure to stop parser before checking max errors

Browse Source 
Short-lived regression from 7a41b18c.
This commit is contained in:
Nick Wellnhofer
2025-08-02 21:27:32 +02:00
parent 149c04c02d
commit 152fbb60a9
1 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
parserInternals.c
View File

@@ -330,11 +330,31 @@ xmlCtxtVErr(xmlParserCtxt *ctxt, xmlNode *node, xmlErrorDomain domain,
return;
ctxt->nbWarnings += 1;
} else {
/* Report at least one fatal error. */
if ((ctxt->nbErrors >= XML_MAX_ERRORS) &&
((level < XML_ERR_FATAL) || (ctxt->wellFormed == 0)) &&
(!xmlIsCatastrophicError(level, code)))
return;
/*
* By long-standing design, the parser isn't completely
* stopped on well-formedness errors. Only SAX callbacks
* are disabled.
*
* In some situations, we really want to abort as fast
* as possible.
*/
if (xmlIsCatastrophicError(level, code) ||
code == XML_ERR_RESOURCE_LIMIT ||
code == XML_ERR_ENTITY_LOOP) {
ctxt->disableSAX = 2; /* really stop parser */
} else {
/* Report at least one fatal error. */
if (ctxt->nbErrors >= XML_MAX_ERRORS &&
(level < XML_ERR_FATAL || ctxt->wellFormed == 0))
return;
if (level == XML_ERR_FATAL && ctxt->recovery == 0)
ctxt->disableSAX = 1;
}
if (level == XML_ERR_FATAL)
ctxt->wellFormed = 0;
ctxt->errNo = code;
ctxt->nbErrors += 1;
}
@@ -384,27 +404,6 @@ xmlCtxtVErr(xmlParserCtxt *ctxt, xmlNode *node, xmlErrorDomain domain,
xmlCtxtErrMemory(ctxt);
return;
}
if (level >= XML_ERR_ERROR)
ctxt->errNo = code;
if (level == XML_ERR_FATAL) {
ctxt->wellFormed = 0;
/*
* By long-standing design, the parser isn't completely
* stopped on well-formedness errors. Only SAX callbacks
* are disabled.
*
* In some situations, we really want to abort as fast
* as possible.
*/
if (xmlCtxtIsCatastrophicError(ctxt) ||
code == XML_ERR_RESOURCE_LIMIT ||
code == XML_ERR_ENTITY_LOOP)
ctxt->disableSAX = 2; /* really stop parser */
else if (ctxt->recovery == 0)
ctxt->disableSAX = 1;
}
}
/**