Fix a potential bug in the C++0x cleaning.

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

diff --git a/c++0x/xml-template.cpp b/c++0x/xml-template.cpp
index 7278236d911d6b50d4a1236a97fd6c8e5df8df7e..c2b62cd77ecbb6da8441e938809bb4042120c453 100644 (file)
--- a/c++0x/xml-template.cpp
+++ b/c++0x/xml-template.cpp
@@ -5,41 +5,90 @@
 
 using namespace std;
 
+namespace {
+
+void clean_node(xmlNode *node)
+{
+       if (node->type != XML_ELEMENT_NODE) {
+               return;
+       }
+       if (strcmp(reinterpret_cast<const char *>(node->ns->href), "http://template.sesse.net/") == 0) {
+               xmlNode *frag = xmlNewDocFragment(node->doc);
+               xmlReplaceNode(node, frag);
+               frag->children = node->children;
+               frag->last = node->last;
+       }
+}
+
+}  // namespace
+
+Directive::~Directive() {}
+
 Replace::Replace(const string &str)
        : str(str) {}
 
 void Replace::process(xmlNode *node, bool clean) {
-       node->children = xmlNewTextLen(reinterpret_cast<const xmlChar *>(str.data()), str.size());
+       xmlNodeSetContentLen(node, reinterpret_cast<const xmlChar *>(str.data()), str.size());
+       if (clean) {
+               clean_node(node);
+       }
 }
 
-Clone::Clone(const std::vector<Directive *> &subdirectives)
+Clone::Clone(const vector<Directive *> &subdirectives)
+       : subdirectives(subdirectives) {}
+       
+Clone::Clone(initializer_list<Directive *> subdirectives)
        : subdirectives(subdirectives) {}
 
-void Clone::process(xmlNode *node, bool clean) {
+Clone::~Clone()
+{
+       for (auto it : subdirectives) {
+               delete it;
+       }
+}
+
+void Clone::process(xmlNode *node, bool clean)
+{
        // We can't use xmlNewDocFragment, since xmlDOMWrapCloneNode only knows
        // how to clone elements.
        vector<xmlNode *> new_nodes;
 
        for (auto it : subdirectives) {
-               xmlDOMWrapCtxt ctx;
                xmlNode *new_node;
-               int ret = xmlDOMWrapCloneNode(NULL, node->doc, node, &new_node, node->doc, NULL, 1, 0);
+               xmlDOMWrapCloneNode(NULL, node->doc, node, &new_node, node->doc, NULL, 1, 0);
                it->process(new_node, clean);
                for (xmlNode *child = new_node->children; child != NULL; child = child->next) {
                        new_nodes.push_back(child);
                }
        }
 
-       node->children = NULL;
+       xmlFreeNodeList(node->children);
+       node->content = NULL;
+       node->children = node->last = NULL;
+
        for (auto child : new_nodes) {
                xmlAddChild(node, child);
        }       
+       if (clean) {
+               clean_node(node);
+       }
 }
 
 Substitute::Substitute(const unordered_map<string, Directive*> &substitution_map)
        : substitution_map(substitution_map) {}
+       
+Substitute::Substitute(initializer_list<pair<const string, Directive*>> substitution_map)
+       : substitution_map(substitution_map) {}
 
-void Substitute::process(xmlNode *node, bool clean) {
+Substitute::~Substitute()
+{
+       for (auto it : substitution_map) {
+               delete it.second;
+       }
+}
+
+void Substitute::process(xmlNode *node, bool clean)
+{
        for (xmlNode *child = node->children; child != NULL; child = child->next) {
                bool processed = false;
 
@@ -76,6 +125,9 @@ void Substitute::process(xmlNode *node, bool clean) {
                        process(child, clean);
                }
        }
+       if (clean) {
+               clean_node(node);
+       }
 }
        
 void process_file(const string &input_filename,
@@ -87,6 +139,7 @@ void process_file(const string &input_filename,
        xmlDocPtr doc = xmlParseFile(input_filename.c_str());
        root_directive->process(xmlDocGetRootElement(doc), true);
        xmlSaveFile(output_filename.c_str(), doc);
+       xmlFreeDoc(doc);
 
        xmlCleanupParser();
        xmlMemoryDump();