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

Fix recursion check in xinclude.c

Browse Source 
Compare the included URL with the document's URL to detect local
inclusions.

Fixes #348.
This commit is contained in:
Nick Wellnhofer 2022-03-02 02:57:49 +01:00
parent 34e9d6aa79
commit d9808f6331
4 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
result/XInclude/red.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<book xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink">
<chapter>
<para xml:id="t100">Introduction</para>
</chapter>
<chapter>
<para xml:id="t100">Introduction</para>
</chapter>
</book>

26
result/XInclude/red.xml.rdr Normal file
View File

@ -0,0 +1,26 @@
0 1 book 0 0
1 14 #text 0 1
1 1 chapter 0 0
2 14 #text 0 1
2 1 para 0 0
3 3 #text 0 1 Introduction
2 15 para 0 0
2 14 #text 0 1
1 15 chapter 0 0
1 14 #text 0 1
1 1 chapter 0 0
2 14 #text 0 1
2 1 para 0 0
3 3 #text 0 1 Introduction
2 15 para 0 0
2 14 #text 0 1
1 15 chapter 0 0
1 14 #text 0 1
0 15 book 0 0

10
test/XInclude/docs/red.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<book xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:xlink="http://www.w3.org/1999/xlink">
<chapter>
<para xml:id="t100">Introduction</para>
</chapter>
<chapter>
<xi:include href="./red.xml" xpointer="t100" parse="xml"/>
</chapter>
</book>

5
xinclude.c
View File

@ -525,8 +525,6 @@ xmlXIncludeAddNode(xmlXIncludeCtxtPtr ctxt, xmlNodePtr cur) {
if (href == NULL) if (href == NULL)
return(-1); return(-1);
} }
if ((href[0] == '#') || (href[0] == 0))
local = 1;
parse = xmlXIncludeGetProp(ctxt, cur, XINCLUDE_PARSE); parse = xmlXIncludeGetProp(ctxt, cur, XINCLUDE_PARSE);
if (parse != NULL) { if (parse != NULL) {
if (xmlStrEqual(parse, XINCLUDE_PARSE_XML)) if (xmlStrEqual(parse, XINCLUDE_PARSE_XML))
@ -623,6 +621,9 @@ xmlXIncludeAddNode(xmlXIncludeCtxtPtr ctxt, xmlNodePtr cur) {
return(-1); return(-1);
} }
if (xmlStrEqual(URL, ctxt->doc->URL))
local = 1;
/* /*
* If local and xml then we need a fragment * If local and xml then we need a fragment
*/ */