From: Rob Richards <rrichards@php.net>
Date: Mon, 28 Aug 2006 23:37:23 +0000 (+0000)
Subject: MFB: fix #38474 (getAttribute select attribute by order, even when prefixed)
X-Git-Tag: RELEASE_1_0_0RC1~1862
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a0d6c14a0f63ccd7740a866526065515eba043f9;p=php

MFB: fix #38474 (getAttribute select attribute by order, even when prefixed)
add test
---

diff --git a/ext/dom/element.c b/ext/dom/element.c
index 437e5c07fd..edcb64b4fb 100644
--- a/ext/dom/element.c
+++ b/ext/dom/element.c
@@ -188,7 +188,24 @@ int dom_element_schema_type_info_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 /* }}} */
 
-
+static xmlAttrPtr dom_get_dom1_attribute(xmlNodePtr elem, xmlChar *name) {
+    int len;
+    const xmlChar *nqname;
+
+	nqname = xmlSplitQName3(name, &len);
+	if (nqname != NULL) {
+		xmlNsPtr ns;
+		xmlChar *prefix = xmlStrndup(name, len);
+		ns = xmlSearchNs(elem->doc, elem, prefix);
+		if (prefix != NULL) {
+			xmlFree(prefix);
+		}
+		if (ns != NULL) {
+			return xmlHasNsProp(elem, nqname, ns->href);
+		}
+	}
+	return xmlHasNsProp(elem, name, NULL);
+}
 
 /* {{{ proto string dom_element_get_attribute(string name);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-666EE0F9
@@ -198,8 +215,9 @@ PHP_FUNCTION(dom_element_get_attribute)
 {
 	zval *id;
 	xmlNode *nodep;
-	char *name, *value;
+	char *name, *value = NULL;
 	dom_object *intern;
+	xmlAttrPtr attr;
 	int name_len;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) {
@@ -208,7 +226,15 @@ PHP_FUNCTION(dom_element_get_attribute)
 
 	DOM_GET_OBJ(nodep, id, xmlNodePtr, intern);
 
-	value = xmlGetProp(nodep, name);
+	attr = dom_get_dom1_attribute(nodep, (xmlChar *)name);
+	if (attr) {
+		if (attr->type == XML_ATTRIBUTE_NODE) {
+			value = xmlNodeListGetString(attr->doc, attr->children, 1);
+		} else {
+			value = xmlStrdup(((xmlAttributePtr)attr)->defaultValue);
+		}
+	}
+	
 	if (value == NULL) {
 		RETURN_EMPTY_TEXT();
 	} else {
@@ -248,7 +274,7 @@ PHP_FUNCTION(dom_element_set_attribute)
 		RETURN_FALSE;
 	}
 
-	attr = xmlHasProp(nodep,name);
+	attr = dom_get_dom1_attribute(nodep, (xmlChar *)name);
 	if (attr != NULL && attr->type != XML_ATTRIBUTE_DECL) {
 		node_list_unlink(attr->children TSRMLS_CC);
 	}
@@ -288,7 +314,7 @@ PHP_FUNCTION(dom_element_remove_attribute)
 		RETURN_FALSE;
 	}
 
-	attrp = xmlHasProp(nodep,name);
+	attrp = dom_get_dom1_attribute(nodep, (xmlChar *)name);
 	if (attrp == NULL) {
 		RETURN_FALSE;
 	}
@@ -327,7 +353,7 @@ PHP_FUNCTION(dom_element_get_attribute_node)
 
 	DOM_GET_OBJ(nodep, id, xmlNodePtr, intern);
 
-	attrp = xmlHasProp(nodep,name);
+	attrp = dom_get_dom1_attribute(nodep, (xmlChar *)name);
 	if (attrp == NULL) {
 		RETURN_FALSE;
 	}
@@ -851,8 +877,9 @@ PHP_FUNCTION(dom_element_has_attribute)
 	zval *id;
 	xmlNode *nodep;
 	dom_object *intern;
-	char *name, *value;
+	char *name;
 	int name_len;
+	xmlAttrPtr attr;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os&", &id, dom_element_class_entry, &name, &name_len, UG(utf8_conv)) == FAILURE) {
 		return;
@@ -860,11 +887,10 @@ PHP_FUNCTION(dom_element_has_attribute)
 
 	DOM_GET_OBJ(nodep, id, xmlNodePtr, intern);
 
-	value = xmlGetProp(nodep, name);
-	if (value == NULL) {
+	attr = dom_get_dom1_attribute(nodep, (xmlChar *)name);
+	if (attr == NULL) {
 		RETURN_FALSE;
 	} else {
-		xmlFree(value);
 		RETURN_TRUE;
 	}
 }
diff --git a/ext/dom/tests/bug38474.phpt b/ext/dom/tests/bug38474.phpt
new file mode 100644
index 0000000000..69b0688f30
--- /dev/null
+++ b/ext/dom/tests/bug38474.phpt
@@ -0,0 +1,41 @@
+--TEST--
+Bug #38474 (getAttribute select attribute by order, even when prefixed)
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$xml = b'<node xmlns:pre="http://foo.com/tr/pre" 
+              xmlns:post="http://foo.com/tr/post"
+              pre:type="bar" type="foo" ><sub /></node>';
+$dom = new DomDocument();
+$dom->loadXML($xml);
+echo $dom->firstChild->getAttribute('type')."\n";
+echo $dom->firstChild->getAttribute('pre:type')."\n";
+
+$dom->firstChild->setAttribute('pre:type', 'bar2');
+$dom->firstChild->setAttribute('type', 'foo2');
+$dom->firstChild->setAttribute('post:type', 'baz');
+$dom->firstChild->setAttribute('new:type', 'baz2');
+
+echo $dom->firstChild->getAttribute('type')."\n";
+echo $dom->firstChild->getAttribute('pre:type')."\n";
+echo $dom->firstChild->getAttribute('post:type')."\n";
+
+$dom->firstChild->removeAttribute('pre:type');
+$dom->firstChild->removeAttribute('type');
+
+echo $dom->firstChild->getAttribute('type')."\n";
+echo $dom->firstChild->getAttribute('pre:type')."\n";
+echo $dom->firstChild->getAttribute('post:type')."\n";
+echo $dom->firstChild->getAttribute('new:type');
+?>
+--EXPECT--
+foo
+bar
+foo2
+bar2
+baz
+
+
+baz
+baz2