Clean up implementation of get_deprecation_suffix_from_attribute()

Author: TimWolla

Zend/zend_execute.c

@@ -1741,36 +1741,42 @@ ZEND_COLD static zend_result ZEND_FASTCALL get_deprecation_suffix_from_attribute
 		return SUCCESS;
 	}
 
+	zend_result result = FAILURE;
+
 	zend_string *message = zend_empty_string;
 	zend_string *since = zend_empty_string;
 
 	zval obj;
 	ZVAL_UNDEF(&obj);
-	zval *z = NULL;
-	zend_string *property;
+	zval *z;
+	zend_string *property = zend_empty_string;
+
+	/* Construct the Deprecated object to correctly handle parameter processing. */
 	if (FAILURE == zend_get_attribute_object(&obj, zend_ce_deprecated, deprecated, scope, NULL)) {
-		return FAILURE;
+		goto out;
 	}
 
+	/* Extract the $message property. */
+	zend_string_release(property);
 	property = ZSTR_KNOWN(ZEND_STR_MESSAGE);
 	if ((z = zend_read_property_ex(zend_ce_deprecated, Z_OBJ_P(&obj), property, false, NULL)) == NULL) {
-		goto fail;
+		goto out;
 	}
-	zend_string_release(property);
 	if (Z_TYPE_P(z) == IS_STRING) {
 		message = zend_string_copy(Z_STR_P(z));
 	}
 
+	/* Extract the $since property. */
+	zend_string_release(property);
 	property = ZSTR_INIT_LITERAL("since", 0);
 	if ((z = zend_read_property_ex(zend_ce_deprecated, Z_OBJ_P(&obj), property, false, NULL)) == NULL) {
-		goto fail;
+		goto out;
 	}
-	zend_string_release(property);
-
 	if (Z_TYPE_P(z) == IS_STRING) {
 		since = zend_string_copy(Z_STR_P(z));
 	}
 
+	/* Construct the suffix. */
 	*message_suffix = zend_strpprintf_unchecked(
 		0,
 		"%s%S%s%S",
@@ -1780,20 +1786,16 @@ ZEND_COLD static zend_result ZEND_FASTCALL get_deprecation_suffix_from_attribute
 		message
 	);
 
-	zend_string_release(since);
-	zend_string_release(message);
-	zval_ptr_dtor(&obj);
+	result = SUCCESS;
 
-	return SUCCESS;
+ out:
 
- fail:
 	zend_string_release(since);
 	zend_string_release(message);
 	zval_ptr_dtor(&obj);
-	zval_ptr_dtor(z);
 	zend_string_release(property);
 
-	return FAILURE;
+	return result;
 }
 
 ZEND_API ZEND_COLD void ZEND_FASTCALL zend_deprecated_function(const zend_function *fbc)