shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2024-10-26 12:25:09 +03:00
Code Releases Activity

xinclude: Clean up xmlXIncludeDoProcess

Browse Source 
Only scan new includes in the second pass. Always reset the "replace"
flag.

This only matters if xmlXIncludeDoProcess is called multiple times on
the same document which currently only happens when called from
xmlreader.
This commit is contained in:
Nick Wellnhofer 2022-10-30 12:03:51 +01:00
parent 075cee9e9f
commit 7e078cc1fe
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xinclude.c
View File

@ -2227,7 +2227,7 @@ xmlXIncludeDoProcess(xmlXIncludeCtxtPtr ctxt, xmlNodePtr tree) {
xmlXIncludeRefPtr ref;
xmlNodePtr cur;
int ret = 0;
int i;
int i, start;
if ((tree == NULL) || (tree->type == XML_NAMESPACE_DECL))
return(-1);
@ -2237,6 +2237,7 @@ xmlXIncludeDoProcess(xmlXIncludeCtxtPtr ctxt, xmlNodePtr tree) {
/*
* First phase: lookup the elements in the document
*/
start = ctxt->incNr;
cur = tree;
do {
/* TODO: need to work on entities -> stack */
@ -2276,13 +2277,13 @@ xmlXIncludeDoProcess(xmlXIncludeCtxtPtr ctxt, xmlNodePtr tree) {
/*
* Second phase: extend the original document infoset.
*/
for (i = 0; i < ctxt->incNr; i++) {
for (i = start; i < ctxt->incNr; i++) {
if (ctxt->incTab[i]->replace != 0) {
if ((ctxt->incTab[i]->inc != NULL) ||
(ctxt->incTab[i]->emptyFb != 0)) { /* (empty fallback) */
xmlXIncludeIncludeNode(ctxt, ctxt->incTab[i]);
ctxt->incTab[i]->replace = 0;
}
ctxt->incTab[i]->replace = 0;
} else {
/*
* Ignore includes which were added indirectly, for example