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

DanielEScherzer · web-flow · commit 5a18279b5d79 · 2024-09-04T23:56:18.000+01: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 Test in %s on line %d
diff --git a/Zend/zend_attributes.c b/Zend/zend_attributes.c
@@ -86,6 +86,11 @@ 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 %s",
+			ZSTR_VAL(scope->name)
+		);
+	}
 	scope->ce_flags |= ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES;
 }
 

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