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

parser: Fix entity check in attributes

Browse Source 
Don't set the "checked" flag when checking entities in default attribute
values. These entities could reference other entities which weren't
defined yet, so the check isn't reliable.

This fixes a short-lived regression which could lead to a call stack
overflow later in xmlStringGetNodeList.
This commit is contained in:
Nick Wellnhofer 2023-01-17 13:50:51 +01:00
parent 59b3366178
commit d320a683d1
5 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
parser.c
View File

@ -4091,8 +4091,16 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) {
/* check */ 1);
--ctxt->depth;
ent->flags |= XML_ENT_CHECKED;
ent->expandedSize = ctxt->sizeentcopy;
/*
* If we're parsing DTD content, the entity
* might reference other entities which
* weren't defined yet, so the check isn't
* reliable.
*/
if (ctxt->inSubset == 0) {
ent->flags |= XML_ENT_CHECKED;
ent->expandedSize = ctxt->sizeentcopy;
}
if (rep != NULL) {
xmlFree(rep);

6
result/errors/rec_att_default.xml.ent Normal file
View File

@ -0,0 +1,6 @@
./test/errors/rec_att_default.xml:3: parser error : Entity 'b' not defined
<!ATTLIST x y CDATA "&a;">
^
./test/errors/rec_att_default.xml:6: parser error : Detected an entity reference loop
<doc attr="&a;"/>
^

6
result/errors/rec_att_default.xml.err Normal file
View File

@ -0,0 +1,6 @@
./test/errors/rec_att_default.xml:3: parser error : Entity 'b' not defined
<!ATTLIST x y CDATA "&a;">
^
./test/errors/rec_att_default.xml:6: parser error : Detected an entity reference loop
<doc attr="&a;"/>
^

7
result/errors/rec_att_default.xml.str Normal file
View File

@ -0,0 +1,7 @@
./test/errors/rec_att_default.xml:3: parser error : Entity 'b' not defined
<!ATTLIST x y CDATA "&a;">
^
./test/errors/rec_att_default.xml:6: parser error : Detected an entity reference loop
<doc attr="&a;"/>
^
./test/errors/rec_att_default.xml : failed to parse

6
test/errors/rec_att_default.xml Normal file
View File

@ -0,0 +1,6 @@
<!DOCTYPE doc SYSTEM "N" [
<!ENTITY a "&b;">
<!ATTLIST x y CDATA "&a;">
<!ENTITY b "&a;">
]>
<doc attr="&a;"/>