Fix incorrect exception type when handling with invalid characters

Author: nielsdos

ext/dom/document.c

@@ -907,9 +907,6 @@ PHP_METHOD(DOM_Document, createAttributeNS)
 		if (UNEXPECTED(errorcode != 0)) {
 			goto error;
 		}
-		if (UNEXPECTED(xmlValidateName((xmlChar *) localname, 0) != 0)) {
-			errorcode = INVALID_CHARACTER_ERR;
-		}
 		/* If prefix is "xml" and namespace is not the XML namespace, then throw a "NamespaceError" DOMException. */
 		if (UNEXPECTED(!zend_string_equals_literal(uri, "http://www.w3.org/XML/1998/namespace") && xmlStrEqual(BAD_CAST prefix, BAD_CAST "xml"))) {
 			errorcode = NAMESPACE_ERR;
@@ -926,7 +923,7 @@ PHP_METHOD(DOM_Document, createAttributeNS)
 			goto error;
 		}
 
-		nodep = (xmlNodePtr) xmlNewDocProp(docp, (xmlChar *) localname, NULL);
+		nodep = (xmlNodePtr) xmlNewDocProp(docp, BAD_CAST localname, NULL);
 		if (UNEXPECTED(nodep == NULL)) {
 			php_dom_throw_error(INVALID_STATE_ERR, /* strict */ true);
 			RETURN_THROWS();

ext/dom/php_dom.c

@@ -1642,7 +1642,7 @@ int dom_check_qname(char *qname, char **localname, char **prefix, int uri_len, i
 
 	/* 1 */
 	if (xmlValidateQName((xmlChar *) qname, 0) != 0) {
-		return NAMESPACE_ERR;
+		return INVALID_CHARACTER_ERR;
 	}
 
 	/* 2 */

ext/dom/tests/DOMDocument_createAttributeNS_name_validation.phpt

@@ -0,0 +1,22 @@
+--TEST--
+DOMDocument::createAttributeNS() name validation
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+$dom = new DOMDocument();
+$dom->loadXML("<container/>");
+try {
+    $dom->createAttributeNs("urn:a", "a:b:c");
+} catch (DOMException $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    $dom->createAttributeNs("urn:a", ":");
+} catch (DOMException $e) {
+    echo $e->getMessage(), "\n";
+}
+?>
+--EXPECT--
+Invalid Character Error
+Invalid Character Error

ext/dom/tests/bug44648.phpt

@@ -41,5 +41,5 @@ echo $doc->saveXML($root);
 Invalid Character Error
 Invalid Character Error
 Invalid Character Error
-Namespace Error
+Invalid Character Error
 <root/>

ext/dom/tests/dom_create_element.phpt

@@ -322,7 +322,7 @@ try {
 
 ?>
 --EXPECT--
- 1 DOMDocument::createElement('valid')
+1 DOMDocument::createElement('valid')
 valid
  2 DOMDocument::createElement('-invalid')
 Invalid Character Error
@@ -335,15 +335,15 @@ valid
  6 DOMDocument::createElementNS('http://valid.com', 'prefix:valid')
 valid
  7 DOMDocument::createElementNS('http://valid.com', '-invalid')
-Namespace Error
+Invalid Character Error
  8 DOMDocument::createElementNS('http://valid.com', 'prefix:-invalid')
-Namespace Error
+Invalid Character Error
  9 DOMDocument::createElementNS('', 'prefix:invalid')
 Namespace Error
 10 DOMDocument::createElementNS('http://valid.com', 'prefix:valid:invalid')
-Namespace Error
+Invalid Character Error
 11 DOMDocument::createElementNS('http://valid.com', '-prefix:valid')
-Namespace Error
+Invalid Character Error
 12 DOMDocument::createElementNS('-', 'prefix:valid')
 valid
 13 DOMElement::__construct('valid')
@@ -361,11 +361,11 @@ valid
 19 DOMElement::__construct('-invalid', '', 'http://valid.com')
 Invalid Character Error
 20 DOMElement::__construct('prefix:-invalid', '', 'http://valid.com')
-Namespace Error
+Invalid Character Error
 21 DOMElement::__construct('prefix:invalid', '', '')
 Namespace Error
 22 DOMElement::__construct('prefix:valid:invalid', '', 'http://valid.com')
-Namespace Error
+Invalid Character Error
 23 DOMElement::__construct('-prefix:valid', '', 'http://valid.com')
 Invalid Character Error
 24 DOMElement::__construct('prefix:valid', '', '-')