From 9e1c72da8a36993419b59c5fc6339e995c481e00 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Fri, 31 Aug 2001 20:03:19 +0000 Subject: [PATCH] Armin Sander pointed a possible text coalescing problem, completed his * tree.c: Armin Sander pointed a possible text coalescing problem, completed his patch. Daniel --- ChangeLog | 5 +++++ tree.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee971fe94..27536937a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Aug 31 22:02:10 CEST 2001 Daniel Veillard + + * tree.c: Armin Sander pointed a possible text coalescing + problem, completed his patch. + Fri Aug 31 18:30:28 CEST 2001 Bjorn Reese * trionan.c: Fixed const and volatile re-definition problem diff --git a/tree.c b/tree.c index 68d4592a7..d002d7f70 100644 --- a/tree.c +++ b/tree.c @@ -1968,7 +1968,8 @@ xmlAddNextSibling(xmlNodePtr cur, xmlNodePtr elem) { xmlFreeNode(elem); return(cur); } - if ((cur->next != NULL) && (cur->type == XML_TEXT_NODE)) { + if ((cur->next != NULL) && (cur->next->type == XML_TEXT_NODE) && + (cur->name == cur->next->name)) { #ifndef XML_USE_BUFFER_CONTENT xmlChar *tmp; @@ -2047,7 +2048,8 @@ xmlAddPrevSibling(xmlNodePtr cur, xmlNodePtr elem) { xmlFreeNode(elem); return(cur); } - if ((cur->prev != NULL) && (cur->prev->type == XML_TEXT_NODE)) { + if ((cur->prev != NULL) && (cur->prev->type == XML_TEXT_NODE) && + (cur->name == cur->prev->name)) { #ifndef XML_USE_BUFFER_CONTENT xmlNodeAddContent(cur->prev, elem->content); #else