Fix a typo causing references to freed memory.

[xml-template] / c++0x / xml-template.cpp

diff --git a/c++0x/xml-template.cpp b/c++0x/xml-template.cpp
index 3be1407b3b5592d93b6768859135a90dfc26481f..a3156e7b9ff888d644eb6424d23101ca8836e00b 100644 (file)
--- a/c++0x/xml-template.cpp
+++ b/c++0x/xml-template.cpp
@@ -12,6 +12,12 @@ void Replace::process(xmlNode *node, bool clean) {
        node->children = xmlNewTextLen(reinterpret_cast<const xmlChar *>(str.data()), str.size());
 }
 
+Clone::Clone(const std::vector<Directive *> &subdirectives)
+       : subdirectives(subdirectives) {}
+
+void Clone::process(xmlNode *node, bool clean) {
+}
+
 Substitute::Substitute(const unordered_map<string, Directive*> &substitution_map)
        : substitution_map(substitution_map) {}
 
@@ -26,6 +32,14 @@ void Substitute::process(xmlNode *node, bool clean) {
                                if (strcmp(reinterpret_cast<const char *>(attr->ns->href), "http://template.sesse.net/") == 0 &&
                                    strcmp(reinterpret_cast<const char *>(attr->name), "id") == 0) {
                                        id = reinterpret_cast<const char *>(xmlNodeGetContent(attr->children));
+
+                                       if (clean) {
+                                               if (attr->prev == NULL) {
+                                                       child->properties = attr->next;
+                                               } else {
+                                                       attr->prev->next = attr->next;
+                                               }
+                                       }
                                }
                        }
 
@@ -53,7 +67,7 @@ void process_file(const string &input_filename,
        LIBXML_TEST_VERSION
 
        xmlDocPtr doc = xmlParseFile(input_filename.c_str());
-       root_directive->process(xmlDocGetRootElement(doc), false);
+       root_directive->process(xmlDocGetRootElement(doc), true);
        xmlSaveFile(output_filename.c_str(), doc);
 
        xmlCleanupParser();