In the C++11 version, we would set the wrong key on id+attribute matches. Fixed.

[xml-template] / c++11 / xml-template.cpp

diff --git a/c++11/xml-template.cpp b/c++11/xml-template.cpp
index 2e8fb9429fa3ab4508f33dcd4cd106ac75c39f52..503e5e329d4f7269a8115c1c1df20114705b4819 100644 (file)
--- a/c++11/xml-template.cpp
+++ b/c++11/xml-template.cpp
@@ -190,9 +190,8 @@ void Substitute::process(xmlNode *node, bool clean)
                        }
 
                        // Check all substitutions to see if we found anything appropriate.
+                       string tag = reinterpret_cast<const char *>(child->name);
                        for (auto it : substitution_map) {
-                               string tag = reinterpret_cast<const char *>(child->name);
-
                                // Attribute substitution.
                                if (begins_with(it.first, tag + "/")) {
                                        const xmlChar *attr_key = reinterpret_cast<const xmlChar *>(
@@ -202,7 +201,7 @@ void Substitute::process(xmlNode *node, bool clean)
                                        xmlSetProp(child, attr_key, attr_value);
                                } else if ((!id.empty() && begins_with(it.first, "#" + id + "/"))) {
                                        const xmlChar *attr_key = reinterpret_cast<const xmlChar *>(
-                                               it.first.c_str() + tag.size() + 2);
+                                               it.first.c_str() + id.size() + 2);
                                        const xmlChar *attr_value = reinterpret_cast<const xmlChar *>(
                                                it.second->get_contents().c_str());
                                        xmlSetProp(child, attr_key, attr_value);