ext/uri: avoid shutdown abort for lazy enum alias

Author: OracleNep

ext/uri/php_uri.c

@@ -1109,13 +1109,15 @@ PHPAPI zend_result php_uri_parser_register(const php_uri_parser *uri_parser)
 
 	zend_string_release_ex(key, true);
 
-	return result;
-}
-
-/* Registers the deprecated, misspelled "InvalidReverseSoldius" class constant as
- * an alias of the correctly spelled UrlValidationErrorType::InvalidReverseSolidus
- * enum case. The typo was shipped in PHP 8.5, so the alias is kept for backwards
- * compatibility.
+	return result;
+}
+
+#define PHP_URI_WHATWG_INVALID_REVERSE_SOLIDIUS_ALIAS "InvalidReverseSoldius"
+
+/* Registers the deprecated, misspelled "InvalidReverseSoldius" class constant as
+ * an alias of the correctly spelled UrlValidationErrorType::InvalidReverseSolidus
+ * enum case. The typo was shipped in PHP 8.5, so the alias is kept for backwards
+ * compatibility.
  *
  * The value is stored as a lazy "self::InvalidReverseSolidus" constant AST instead
  * of an eager enum case object: enum case objects are materialized lazily (the case
@@ -1159,26 +1161,53 @@ static void php_uri_register_invalid_reverse_solidus_alias(zend_class_entry *ce)
 	Z_LINENO_P(zend_ast_get_zval(ast->child[1])) = 0;
 
 	zval alias_value;
-	Z_TYPE_INFO(alias_value) = IS_CONSTANT_AST;
-	Z_AST(alias_value) = ref;
-
-	zend_string *alias_name = zend_string_init_interned("InvalidReverseSoldius", sizeof("InvalidReverseSoldius") - 1, true);
-	zend_class_constant *alias = zend_declare_class_constant_ex(
-		ce, alias_name, &alias_value, ZEND_ACC_PUBLIC | ZEND_ACC_DEPRECATED, NULL);
-
-	/* Attach #[\Deprecated(since: "8.6", message: "...")] so the deprecation notice
-	 * directs users to the correctly spelled enum case. */
+	Z_TYPE_INFO(alias_value) = IS_CONSTANT_AST;
+	Z_AST(alias_value) = ref;
+
+	zend_string *alias_name = zend_string_init_interned(
+		PHP_URI_WHATWG_INVALID_REVERSE_SOLIDIUS_ALIAS,
+		sizeof(PHP_URI_WHATWG_INVALID_REVERSE_SOLIDIUS_ALIAS) - 1,
+		true);
+	zend_class_constant *alias = zend_declare_class_constant_ex(
+		ce, alias_name, &alias_value, ZEND_ACC_PUBLIC | ZEND_ACC_DEPRECATED, NULL);
+	zend_string_release_ex(alias_name, true);
+
+	/* Attach #[\Deprecated(since: "8.6", message: "...")] so the deprecation notice
+	 * directs users to the correctly spelled enum case. */
 	zend_attribute *attr = zend_add_class_constant_attribute(ce, alias, ZSTR_KNOWN(ZEND_STR_DEPRECATED_CAPITALIZED), 2);
 	ZVAL_STR(&attr->args[0].value, zend_string_init("8.6", strlen("8.6"), 1));
 	attr->args[0].name = ZSTR_KNOWN(ZEND_STR_SINCE);
 	ZVAL_STR(&attr->args[1].value, zend_string_init("use Uri\\WhatWg\\UrlValidationErrorType::InvalidReverseSolidus instead", strlen("use Uri\\WhatWg\\UrlValidationErrorType::InvalidReverseSolidus instead"), 1));
-	attr->args[1].name = ZSTR_KNOWN(ZEND_STR_MESSAGE);
-}
-
-static PHP_MINIT_FUNCTION(uri)
-{
-	php_uri_ce_rfc3986_uri = register_class_Uri_Rfc3986_Uri();
-	php_uri_ce_rfc3986_uri->create_object = php_uri_object_create_rfc3986;
+	attr->args[1].name = ZSTR_KNOWN(ZEND_STR_MESSAGE);
+}
+
+static void php_uri_cleanup_invalid_reverse_solidus_alias(zend_class_entry *ce)
+{
+	if (ce == NULL) {
+		return;
+	}
+
+	zend_class_constant *alias = zend_hash_str_find_ptr(
+		&ce->constants_table,
+		PHP_URI_WHATWG_INVALID_REVERSE_SOLIDIUS_ALIAS,
+		sizeof(PHP_URI_WHATWG_INVALID_REVERSE_SOLIDIUS_ALIAS) - 1);
+	if (alias == NULL || alias->ce != ce || Z_TYPE(alias->value) != IS_CONSTANT_AST) {
+		return;
+	}
+
+	/* This alias uses a regular class-constant AST, while Zend's internal class
+	 * cleanup currently only expects lazy enum cases to remain as CONSTANT_AST.
+	 * If the alias was never resolved during runtime, free the extension-owned
+	 * persistent AST before Zend destroys the internal class entry. */
+	ZEND_ASSERT(Z_ASTVAL(alias->value)->kind == ZEND_AST_CLASS_CONST);
+	pefree(Z_AST(alias->value), 1);
+	ZVAL_UNDEF(&alias->value);
+}
+
+static PHP_MINIT_FUNCTION(uri)
+{
+	php_uri_ce_rfc3986_uri = register_class_Uri_Rfc3986_Uri();
+	php_uri_ce_rfc3986_uri->create_object = php_uri_object_create_rfc3986;
 	php_uri_ce_rfc3986_uri->default_object_handlers = &object_handlers_rfc3986_uri;
 	memcpy(&object_handlers_rfc3986_uri, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	object_handlers_rfc3986_uri.offset = offsetof(php_uri_object, std);
@@ -1235,13 +1264,14 @@ static PHP_MINFO_FUNCTION(uri)
 #endif
 	php_info_print_table_end();
 }
-
-static PHP_MSHUTDOWN_FUNCTION(uri)
-{
-	zend_hash_destroy(&uri_parsers);
-
-	return SUCCESS;
-}
+
+static PHP_MSHUTDOWN_FUNCTION(uri)
+{
+	php_uri_cleanup_invalid_reverse_solidus_alias(php_uri_ce_whatwg_url_validation_error_type);
+	zend_hash_destroy(&uri_parsers);
+
+	return SUCCESS;
+}
 
 PHP_RINIT_FUNCTION(uri)
 {

ext/uri/tests/invalid_reverse_solidus_alias_shutdown.phpt

@@ -0,0 +1,10 @@
+--TEST--
+Uri\WhatWg\UrlValidationErrorType unused deprecated typo alias does not abort shutdown
+--EXTENSIONS--
+uri
+--FILE--
+<?php
+echo "Done\n";
+?>
+--EXPECT--
+Done