lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-24 13:33:01 +03:00
Code Activity

applied patch from bug #454608 from Patrik Fimml. Fixes bug #454608.

Browse Source 
* xinclude.c: applied patch from bug #454608 from Patrik Fimml.
  Fixes bug #454608.

svn path=/trunk/; revision=3644
This commit is contained in:
William M. Brack
2007-07-18 18:04:55 +00:00
parent 65fcf27ab8
commit b0a94e8bfa
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
Wed Jul 18 11:05:08 PDT 2007 William Brack <wbrack@mmm.com.hk>
* xinclude.c: applied patch from bug #454608 from Patrik Fimml.
Fixes bug #454608.
Wed Jul 11 19:57:59 CEST 2007 Daniel Veillard <daniel@veillard.com> Wed Jul 11 19:57:59 CEST 2007 Daniel Veillard <daniel@veillard.com>
* xmlschemas.c: applied patch for xsi:nil from Frank Gross, this * xmlschemas.c: applied patch for xsi:nil from Frank Gross, this

13
xinclude.c
View File

@@ -1606,6 +1606,7 @@ loaded:
if (set->nodeTab[i] == NULL) if (set->nodeTab[i] == NULL)
continue; continue;
switch (set->nodeTab[i]->type) { switch (set->nodeTab[i]->type) {
case XML_ELEMENT_NODE:
case XML_TEXT_NODE: case XML_TEXT_NODE:
case XML_CDATA_SECTION_NODE: case XML_CDATA_SECTION_NODE:
case XML_ENTITY_REF_NODE: case XML_ENTITY_REF_NODE:
@@ -1618,18 +1619,6 @@ loaded:
case XML_DOCB_DOCUMENT_NODE: case XML_DOCB_DOCUMENT_NODE:
#endif #endif
continue; continue;
case XML_ELEMENT_NODE: {
xmlChar *nodeBase;
xmlNodePtr el = set->nodeTab[i];
nodeBase = xmlNodeGetBase(el->doc, el);
if (nodeBase != NULL) {
if (!xmlStrEqual(nodeBase, el->doc->URL))
xmlNodeSetBase(el, nodeBase);
xmlFree(nodeBase);
}
continue;
}
case XML_ATTRIBUTE_NODE: case XML_ATTRIBUTE_NODE:
xmlXIncludeErr(ctxt, ctxt->incTab[nr]->ref, xmlXIncludeErr(ctxt, ctxt->incTab[nr]->ref,