shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-03-31 06:50:06 +03:00
Code

xinclude: Fix false positives in inclusion loop detection

Browse Source 
xmlXIncludeRecurseDoc can realloc the cache.
This commit is contained in:
Nick Wellnhofer 2023-05-08 16:45:28 +02:00
parent bdb5667a5c
commit 105ce73da0
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xinclude.c
View File

@ -1265,6 +1265,7 @@ xmlXIncludeLoadDoc(xmlXIncludeCtxtPtr ctxt, const xmlChar *url,
xmlChar *fragment = NULL;
int i = 0;
int ret = -1;
int cacheNr;
#ifdef LIBXML_XPTR_ENABLED
int saveFlags;
#endif
@ -1365,7 +1366,8 @@ xmlXIncludeLoadDoc(xmlXIncludeCtxtPtr ctxt, const xmlChar *url,
ctxt->urlMax = newSize;
ctxt->urlTab = tmp;
}
cache = &ctxt->urlTab[ctxt->urlNr++];
cacheNr = ctxt->urlNr++;
cache = &ctxt->urlTab[cacheNr];
cache->doc = doc;
cache->url = xmlStrdup(URL);
cache->expanding = 0;
@ -1403,6 +1405,8 @@ xmlXIncludeLoadDoc(xmlXIncludeCtxtPtr ctxt, const xmlChar *url,
*/
cache->expanding = 1;
xmlXIncludeRecurseDoc(ctxt, doc, URL);
/* urlTab might be reallocated. */
cache = &ctxt->urlTab[cacheNr];
cache->expanding = 0;
loaded: