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

tree: Don't coalesce text nodes in xmlAdd{Prev,Next}Sibling

Browse Source 
Commit 9e1c72da from 2001 introduced a bug where xmlAddPrevSibling and
xmlAddNextSibling would only try to merge text nodes with one of its
new siblings. Commit 4ccd3eb8 fixed this bug but unfortunately, lxml
and possibly other downstream code depend on text nodes not being
merged.

To avoid breaking downstream code while still having somewhat
consistent API behavior, it's probably best to make these functions
never coalesce text nodes.
This commit is contained in:
Nick Wellnhofer 2024-03-29 11:16:45 +01:00
parent 2cc7f71016
commit f43197fca7
3 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
result/XInclude/fallback5.xml.rdr
View File

@ -6,80 +6,110 @@
1 1 elem 1 0
1 14 #text 0 1
1 14 #text 0 1
1 1 elem 1 0
1 14 #text 0 1
1 14 #text 0 1
1 1 elem 1 0
1 14 #text 0 1
1 14 #text 0 1
1 1 elem 1 0
1 14 #text 0 1
1 14 #text 0 1
1 1 elem 1 0
1 14 #text 0 1
1 14 #text 0 1
1 1 elem 1 0
1 14 #text 0 1
1 14 #text 0 1
1 1 elem 1 0
1 14 #text 0 1
1 14 #text 0 1
1 1 elem 1 0
1 14 #text 0 1
1 14 #text 0 1
1 1 elem 1 0
1 14 #text 0 1
1 14 #text 0 1
1 1 elem 1 0
1 14 #text 0 1
1 14 #text 0 1
1 1 elem 1 0
1 14 #text 0 1
1 14 #text 0 1
1 1 elem 1 0
1 14 #text 0 1
1 14 #text 0 1
1 1 elem 1 0
1 14 #text 0 1
1 14 #text 0 1
1 1 elem 1 0
1 14 #text 0 1
1 14 #text 0 1
1 1 elem 1 0
1 14 #text 0 1
1 14 #text 0 1
1 1 elem 1 0
1 14 #text 0 1
1 14 #text 0 1
1 14 #text 0 1
1 14 #text 0 1
1 14 #text 0 1
1 14 #text 0 1
1 14 #text 0 1
1 14 #text 0 1
1 14 #text 0 1
1 14 #text 0 1
1 14 #text 0 1
1 14 #text 0 1
1 14 #text 0 1
1 14 #text 0 1
1 14 #text 0 1
1 14 #text 0 1
1 14 #text 0 1

20
tree.c
View File

@ -3030,7 +3030,7 @@ xmlInsertProp(xmlDocPtr doc, xmlNodePtr cur, xmlNodePtr parent,
static xmlNodePtr
xmlInsertNode(xmlDocPtr doc, xmlNodePtr cur, xmlNodePtr parent,
xmlNodePtr prev, xmlNodePtr next) {
xmlNodePtr prev, xmlNodePtr next, int coalesce) {
xmlNodePtr oldParent;
if (cur->type == XML_ATTRIBUTE_NODE)
@ -3039,7 +3039,7 @@ xmlInsertNode(xmlDocPtr doc, xmlNodePtr cur, xmlNodePtr parent,
/*
* Coalesce text nodes
*/
if (cur->type == XML_TEXT_NODE) {
if ((coalesce) && (cur->type == XML_TEXT_NODE)) {
if ((prev != NULL) && (prev->type == XML_TEXT_NODE) &&
(prev->name == cur->name)) {
if (xmlTextAddContent(prev, cur->content, -1) < 0)
@ -3122,9 +3122,7 @@ xmlInsertNode(xmlDocPtr doc, xmlNodePtr cur, xmlNodePtr parent,
*
* Unlinks @cur and inserts it as next sibling after @prev.
*
* If @cur is a text node, it may be merged with an adjacent text
* node and freed. In this case the text node containing the merged
* content is returned.
* Unlike xmlAddChild this function does not merge text nodes.
*
* If @cur is an attribute node, it is inserted after attribute
* @prev. If the attribute list contains an attribute with a name
@ -3145,7 +3143,7 @@ xmlAddNextSibling(xmlNodePtr prev, xmlNodePtr cur) {
if (cur == prev->next)
return(cur);
return(xmlInsertNode(prev->doc, cur, prev->parent, prev, prev->next));
return(xmlInsertNode(prev->doc, cur, prev->parent, prev, prev->next, 0));
}
#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_HTML_ENABLED) || \
@ -3157,9 +3155,7 @@ xmlAddNextSibling(xmlNodePtr prev, xmlNodePtr cur) {
*
* Unlinks @cur and inserts it as previous sibling before @next.
*
* If @cur is a text node, it may be merged with an adjacent text
* node and freed. In this case the text node containing the merged
* content is returned.
* Unlike xmlAddChild this function does not merge text nodes.
*
* If @cur is an attribute node, it is inserted before attribute
* @next. If the attribute list contains an attribute with a name
@ -3180,7 +3176,7 @@ xmlAddPrevSibling(xmlNodePtr next, xmlNodePtr cur) {
if (cur == next->prev)
return(cur);
return(xmlInsertNode(next->doc, cur, next->parent, next->prev, next));
return(xmlInsertNode(next->doc, cur, next->parent, next->prev, next, 0));
}
#endif /* LIBXML_TREE_ENABLED */
@ -3226,7 +3222,7 @@ xmlAddSibling(xmlNodePtr node, xmlNodePtr cur) {
if (cur == node)
return(cur);
return(xmlInsertNode(node->doc, cur, node->parent, node, NULL));
return(xmlInsertNode(node->doc, cur, node->parent, node, NULL, 1));
}
/**
@ -3382,7 +3378,7 @@ xmlAddChild(xmlNodePtr parent, xmlNodePtr cur) {
if (cur == prev)
return(cur);
return(xmlInsertNode(parent->doc, cur, parent, prev, NULL));
return(xmlInsertNode(parent->doc, cur, parent, prev, NULL, 1));
}
/**

5
xinclude.c
View File

@ -1957,6 +1957,8 @@ xmlXIncludeIncludeNode(xmlXIncludeCtxtPtr ctxt, xmlXIncludeRefPtr ref) {
if (ctxt->parseFlags & XML_PARSE_NOXINCNODE) {
/*
* Add the list of nodes
*
* TODO: Coalesce text nodes unless we are streaming mode.
*/
while (list != NULL) {
end = list;
@ -1968,9 +1970,6 @@ xmlXIncludeIncludeNode(xmlXIncludeCtxtPtr ctxt, xmlXIncludeRefPtr ref) {
goto err_memory;
}
}
/*
* FIXME: xmlUnlinkNode doesn't coalesce text nodes.
*/
xmlUnlinkNode(cur);
xmlFreeNode(cur);
} else {