Address review comments

Author: beberlei

Zend/zend_attributes.c

@@ -93,7 +93,7 @@ static void attribute_ptr_dtor(zval *v) /* {{{ */
 ZEND_API void zend_compiler_attribute_register(zend_class_entry *ce, zend_attributes_internal_validator validator)
 {
 	if (ce->type != ZEND_INTERNAL_CLASS) {
-		return;
+		zend_error_noreturn(E_ERROR, "Only internal classes can be registered as compiler attribute");
 	}
 
 	zend_string *lcname = zend_string_tolower_ex(ce->name, 1);
@@ -107,10 +107,10 @@ ZEND_API void zend_compiler_attribute_register(zend_class_entry *ce, zend_attrib
 		zend_hash_init(ce->attributes, 8, NULL, attribute_ptr_dtor, 1);
 	}
 
-	zend_attribute *attr = emalloc(ZEND_ATTRIBUTE_SIZE(0));
+	zend_attribute *attr = pemalloc(ZEND_ATTRIBUTE_SIZE(0), 1);
 
 	attr->name = zend_string_copy(zend_ce_php_attribute->name);
-	attr->lcname = zend_string_tolower(attr->name);
+	attr->lcname = zend_string_tolower_ex(attr->name, 1);
 	attr->offset = 0;
 	attr->argc = 0;
 

ext/reflection/php_reflection.c

@@ -1092,6 +1092,8 @@ static void reflection_attribute_factory(zval *object, zend_attribute *data, zen
 static int read_attributes(zval *ret, HashTable *attributes, zend_class_entry *scope,
 		uint32_t offset, zend_string *name, zend_class_entry *base) /* {{{ */
 {
+	ZEND_ASSERT(attributes != NULL);
+
 	zend_attribute *attr;
 	zval tmp;
 
@@ -1110,10 +1112,6 @@ static int read_attributes(zval *ret, HashTable *attributes, zend_class_entry *s
 		return SUCCESS;
 	}
 
-	if (!attributes) {
-		return SUCCESS;
-	}
-
 	ZEND_HASH_FOREACH_PTR(attributes, attr) {
 		if (attr->offset != offset) {
 			continue;
@@ -4180,15 +4178,9 @@ ZEND_METHOD(ReflectionClass, getAttributes)
 	reflection_object *intern;
 	zend_class_entry *ce;
 
-	HashTable *attributes = NULL;
-	zend_class_entry *scope = NULL;
-
 	GET_REFLECTION_OBJECT_PTR(ce);
 
-	attributes = ce->attributes;
-	scope = ce;
-
-	reflect_attributes(INTERNAL_FUNCTION_PARAM_PASSTHRU, attributes, 0, scope);
+	reflect_attributes(INTERNAL_FUNCTION_PARAM_PASSTHRU, ce->attributes, 0, ce);
 }
 /* }}} */