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

xinclude: Test for inclusion loops

Browse Source
This commit is contained in:
Nick Wellnhofer 2022-10-22 16:09:21 +02:00
parent bad30e2b2e
commit 34496f26db
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
result/XInclude/loop.xml.err Normal file
View File

@ -0,0 +1 @@
./test/XInclude/without-reader/loop.xml:2: element include: XInclude error : inclusion loop detected

4
test/XInclude/without-reader/loop.xml Normal file
View File

@ -0,0 +1,4 @@
<x xmlns:xi="http://www.w3.org/2001/XInclude">
<a><xi:include xpointer="xpointer(//b)"/></a>
<b><xi:include xpointer="xpointer(//a)"/></b>
</x>

11
xinclude.c
View File

@ -62,6 +62,7 @@ struct _xmlXIncludeRef {
int count; /* how many refs use that specific doc */
int fallback; /* fallback was loaded */
int emptyFb; /* flag to show fallback empty */
int expanding; /* flag to detect inclusion loops */
};
struct _xmlXIncludeCtxt {
@ -2036,14 +2037,22 @@ xmlXIncludeExpandNode(xmlXIncludeCtxtPtr ctxt, xmlNodePtr node) {
int nr, i;
for (i = ctxt->incBase; i < ctxt->incNr; i++) {
if (ctxt->incTab[i]->ref == node)
if (ctxt->incTab[i]->ref == node) {
if (ctxt->incTab[i]->expanding) {
xmlXIncludeErr(ctxt, node, XML_XINCLUDE_RECURSION,
"inclusion loop detected\n", NULL);
return(NULL);
}
return(ctxt->incTab[i]);
}
}
if (xmlXIncludeAddNode(ctxt, node) < 0)
return(NULL);
nr = ctxt->incNr - 1;
ctxt->incTab[nr]->expanding = 1;
xmlXIncludeLoadNode(ctxt, nr);
ctxt->incTab[nr]->expanding = 0;
return(ctxt->incTab[nr]);
}