lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-24 13:33:01 +03:00
Code Activity

parser: Lower entity nesting limit with XML_PARSE_HUGE

Browse Source 
The old limit of 1024 could lead to excessively deep call stacks. This
could probably be set much lower without causing issues.
This commit is contained in:
Nick Wellnhofer
2022-12-23 21:55:38 +01:00
parent dd62e541ec
commit bc18f4a67c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
parser.c
View File

@@ -2270,7 +2270,7 @@ xmlPushInput(xmlParserCtxtPtr ctxt, xmlParserInputPtr input) {
"Pushing input %d : %.30s\n", ctxt->inputNr+1, input->cur); "Pushing input %d : %.30s\n", ctxt->inputNr+1, input->cur);
} }
if (((ctxt->inputNr > 40) && ((ctxt->options & XML_PARSE_HUGE) == 0)) || if (((ctxt->inputNr > 40) && ((ctxt->options & XML_PARSE_HUGE) == 0)) ||
(ctxt->inputNr > 1024)) { (ctxt->inputNr > 100)) {
xmlFatalErr(ctxt, XML_ERR_ENTITY_LOOP, NULL); xmlFatalErr(ctxt, XML_ERR_ENTITY_LOOP, NULL);
while (ctxt->inputNr > 1) while (ctxt->inputNr > 1)
xmlFreeInputStream(inputPop(ctxt)); xmlFreeInputStream(inputPop(ctxt));
@@ -2625,7 +2625,7 @@ xmlStringDecodeEntitiesInt(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
if (((ctxt->depth > 40) && if (((ctxt->depth > 40) &&
((ctxt->options & XML_PARSE_HUGE) == 0)) || ((ctxt->options & XML_PARSE_HUGE) == 0)) ||
(ctxt->depth > 1024)) { (ctxt->depth > 100)) {
xmlFatalErrMsg(ctxt, XML_ERR_ENTITY_LOOP, xmlFatalErrMsg(ctxt, XML_ERR_ENTITY_LOOP,
"Maximum entity nesting depth exceeded"); "Maximum entity nesting depth exceeded");
return(NULL); return(NULL);
@@ -12818,7 +12818,7 @@ xmlParseExternalEntityPrivate(xmlDocPtr doc, xmlParserCtxtPtr oldctxt,
if (((depth > 40) && if (((depth > 40) &&
((oldctxt == NULL) || (oldctxt->options & XML_PARSE_HUGE) == 0)) || ((oldctxt == NULL) || (oldctxt->options & XML_PARSE_HUGE) == 0)) ||
(depth > 1024)) { (depth > 100)) {
xmlFatalErrMsg(oldctxt, XML_ERR_ENTITY_LOOP, xmlFatalErrMsg(oldctxt, XML_ERR_ENTITY_LOOP,
"Maximum entity nesting depth exceeded"); "Maximum entity nesting depth exceeded");
return(XML_ERR_ENTITY_LOOP); return(XML_ERR_ENTITY_LOOP);
@@ -13108,7 +13108,7 @@ xmlParseBalancedChunkMemoryInternal(xmlParserCtxtPtr oldctxt,
#endif #endif
if (((oldctxt->depth > 40) && ((oldctxt->options & XML_PARSE_HUGE) == 0)) || if (((oldctxt->depth > 40) && ((oldctxt->options & XML_PARSE_HUGE) == 0)) ||
(oldctxt->depth > 1024)) { (oldctxt->depth > 100)) {
xmlFatalErrMsg(oldctxt, XML_ERR_ENTITY_LOOP, xmlFatalErrMsg(oldctxt, XML_ERR_ENTITY_LOOP,
"Maximum entity nesting depth exceeded"); "Maximum entity nesting depth exceeded");
return(XML_ERR_ENTITY_LOOP); return(XML_ERR_ENTITY_LOOP);