feedback

Author: devnexen

ext/dom/node.c

@@ -2128,22 +2128,10 @@ static xmlNsPtr dom_alloc_ns_decl(HashTable *links, xmlNodePtr node)
 	return ns;
 }
 
-/* For DOM-built documents (e.g. createElementNS), namespaces live on node->ns
- * without corresponding xmlns attributes. C14N expects nsDef entries, so create
- * temporary ones. The _private field stays NULL to distinguish from attr-based
- * entries during cleanup. */
+/* Mint a temporary nsDef entry so C14N finds namespaces that live on node->ns
+ * but have no matching xmlns attribute (typical for createElementNS). */
 static void dom_add_synthetic_ns_decl(HashTable *links, xmlNodePtr node, xmlNsPtr src_ns)
 {
-	/* Pre-existing nsDef entries are never filled in for Dom\XMLDocument.
-	 * This loop guards against duplicates from our own synthetic additions
-	 * within the same C14N pass (e.g. when an element and its attributes
-	 * share the same namespace prefix). */
-	for (xmlNsPtr existing = node->nsDef; existing; existing = existing->next) {
-		if (xmlStrEqual(existing->prefix, src_ns->prefix)) {
-			return;
-		}
-	}
-
 	xmlNsPtr ns = dom_alloc_ns_decl(links, node);
 	if (!ns) {
 		return;
@@ -2153,6 +2141,19 @@ static void dom_add_synthetic_ns_decl(HashTable *links, xmlNodePtr node, xmlNsPt
 	ns->prefix = src_ns->prefix ? xmlStrdup(src_ns->prefix) : NULL;
 }
 
+/* Same, but for attribute namespaces, which may collide by prefix with the
+ * element's own ns or with a sibling attribute's ns. */
+static void dom_add_synthetic_ns_decl_for_attr(HashTable *links, xmlNodePtr node, xmlNsPtr src_ns)
+{
+	for (xmlNsPtr existing = node->nsDef; existing; existing = existing->next) {
+		if (xmlStrEqual(existing->prefix, src_ns->prefix)) {
+			return;
+		}
+	}
+
+	dom_add_synthetic_ns_decl(links, node, src_ns);
+}
+
 static void dom_relink_ns_decls_element(HashTable *links, xmlNodePtr node)
 {
 	if (node->type == XML_ELEMENT_NODE) {
@@ -2185,7 +2186,7 @@ static void dom_relink_ns_decls_element(HashTable *links, xmlNodePtr node)
 		}
 		for (xmlAttrPtr attr = node->properties; attr; attr = attr->next) {
 			if (attr->ns && !php_dom_ns_is_fast((const xmlNode *) attr, php_dom_ns_is_xmlns_magic_token)) {
-				dom_add_synthetic_ns_decl(links, node, attr->ns);
+				dom_add_synthetic_ns_decl_for_attr(links, node, attr->ns);
 			}
 		}