Fixed attribute class validation bug.

Author: kooldev

Zend/tests/attributes/005_objects.phpt

@@ -3,6 +3,7 @@ Attributes can be converted into objects.
 --FILE--
 <?php
 
+<<PhpAttribute>>
 class A1
 {
 	public string $name;
@@ -55,6 +56,7 @@ try {
 
 echo "\n";
 
+<<PhpAttribute>>
 class A3
 {
 	private function __construct() { }
@@ -70,6 +72,7 @@ try {
 
 echo "\n";
 
+<<PhpAttribute>>
 class A4 { }
 
 $ref = new \ReflectionFunction(<<A4(1)>> function () { });
@@ -80,6 +83,18 @@ try {
 	var_dump('ERROR 5', $e->getMessage());
 }
 
+echo "\n";
+
+class A5 { }
+
+$ref = new \ReflectionFunction(<<A5>> function () { });
+
+try {
+	$ref->getAttributes()[0]->newInstance();
+} catch (\Error $e) {
+	var_dump('ERROR 6', $e->getMessage());
+}
+
 ?>
 --EXPECT--
 string(2) "A1"
@@ -100,3 +115,6 @@ string(50) "Attribute constructor of class 'A3' must be public"
 
 string(7) "ERROR 5"
 string(71) "Attribute class 'A4' does not have a constructor, cannot pass arguments"
+
+string(7) "ERROR 6"
+string(78) "Attempting to use class 'A5' as attribute that does not have <<PhpAttribute>>."

ext/reflection/php_reflection.c

@@ -6655,6 +6655,7 @@ ZEND_METHOD(ReflectionAttribute, newInstance)
 	attribute_reference *attr;
 
 	zend_class_entry *ce;
+	zend_string *lcname;
 	zval obj;
 
 	zval *args = NULL;
@@ -6672,23 +6673,23 @@ ZEND_METHOD(ReflectionAttribute, newInstance)
 		RETURN_THROWS();
 	}
 
-	if (SUCCESS != object_init_ex(&obj, ce)) {
-		RETURN_THROWS();
-	}
-
-	zend_string *lower_name = zend_string_tolower_ex(ce->name, 1);
+	lcname = zend_string_tolower(ce->name);
 
-	if (ce->type == ZEND_USER_CLASS && ce->info.user.attributes && zend_hash_str_exists(ce->info.user.attributes, "phpattribute", sizeof("phpattribute")-1) == 0) {
-		zend_string_release(lower_name);
+	if (ce->type == ZEND_USER_CLASS && (!ce->info.user.attributes || !zend_hash_str_exists(ce->info.user.attributes, ZEND_STRL("phpattribute")))) {
+		zend_string_release(lcname);
 		zend_throw_error(NULL, "Attempting to use class '%s' as attribute that does not have <<PhpAttribute>>.", ZSTR_VAL(attr->name));
 		RETURN_THROWS();
-	} else if (ce->type == ZEND_INTERNAL_CLASS && zend_hash_exists(&zend_attributes_internal_validators, lower_name) == 0) {
-		zend_string_release(lower_name);
+	} else if (ce->type == ZEND_INTERNAL_CLASS && zend_hash_exists(&zend_attributes_internal_validators, lcname) == 0) {
+		zend_string_release(lcname);
 		zend_throw_error(NULL, "Attempting to use internal class '%s' as attribute that does not have <<PhpCompilerAttribute>>.", ZSTR_VAL(attr->name));
 		RETURN_THROWS();
 	}
 
-	zend_string_release(lower_name);
+	zend_string_release(lcname);
+
+	if (SUCCESS != object_init_ex(&obj, ce)) {
+		RETURN_THROWS();
+	}
 
 	count = zend_hash_num_elements(Z_ARRVAL(attr->arguments));