X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=c%2B%2B0x%2Fxml-template.cpp;h=c1d43edb421bada23f539026b60f60577d6f5124;hb=710ece7d0f537ffe42fa767e5725ab6945362e7e;hp=96f027033ba30acf87ca50af3c6a22a49ed03ef8;hpb=8e1d37633979005acd694fc86ee91b724fe4361b;p=xml-template

diff --git a/c++0x/xml-template.cpp b/c++0x/xml-template.cpp
index 96f0270..c1d43ed 100644
--- a/c++0x/xml-template.cpp
+++ b/c++0x/xml-template.cpp
@@ -17,6 +17,9 @@ void clean_node(xmlNode *node)
 		xmlReplaceNode(node, frag);
 		frag->children = node->children;
 		frag->last = node->last;
+
+		node->children = node->last = NULL;
+		xmlFreeNode(node);
 	}
 }
 
@@ -92,7 +95,9 @@ Substitute::~Substitute()
 
 void Substitute::process(xmlNode *node, bool clean)
 {
-	for (xmlNode *child = node->children; child != NULL; child = child->next) {
+	xmlNode *next_child;
+	for (xmlNode *child = node->children; child != NULL; child = next_child) {
+		next_child = child->next;	
 		bool processed = false;
 
 		if (child->type == XML_ELEMENT_NODE) {
@@ -122,7 +127,7 @@ void Substitute::process(xmlNode *node, bool clean)
 				}
 			}
 		}
-		
+
 		if (!processed) {
 			process(child, clean);
 		}