Fix GH-15731: Prevent #[AllowDynamicProperties] on enums

DanielEScherzer · DanielEScherzer · commit c8de323457c5 · 2024-09-03T11:32:33.000-07:00
diff --git a/Zend/tests/allow_dynamic_properties_on_enum.phpt b/Zend/tests/allow_dynamic_properties_on_enum.phpt
@@ -0,0 +1,11 @@
+--TEST--
+#[AllowDynamicProperties] cannot be applied to enum (GH-15731)
+--FILE--
+<?php
+
+#[AllowDynamicProperties]
+enum Test {}
+
+?>
+--EXPECTF--
+Fatal error: Cannot apply #[AllowDynamicProperties] to enum in %s on line %d
diff --git a/Zend/zend_attributes.c b/Zend/zend_attributes.c
@@ -84,6 +84,9 @@ static void validate_allow_dynamic_properties(
 			ZSTR_VAL(scope->name)
 		);
 	}
+	if (scope->ce_flags & ZEND_ACC_ENUM) {
+		zend_error_noreturn(E_ERROR, "Cannot apply #[AllowDynamicProperties] to enum");
+	}
 	scope->ce_flags |= ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,9 @@ static void validate_allow_dynamic_properties(`
`84`	`84`	`ZSTR_VAL(scope->name)`
`85`	`85`	`);`
`86`	`86`	`}`
	`87`	`+ if (scope->ce_flags & ZEND_ACC_ENUM) {`
	`88`	`+ zend_error_noreturn(E_ERROR, "Cannot apply #[AllowDynamicProperties] to enum");`
	`89`	`+ }`
`87`	`90`	`scope->ce_flags \|= ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES;`
`88`	`91`	`}`
`89`	`92`