Use safe_pemalloc for generic params alloc

Girgias · Girgias · commit 24bcdee075a5 · 2025-05-14T08:28:30.000+01:00
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -9153,7 +9153,7 @@ static void zend_compile_enum_backing_type(zend_class_entry *ce, zend_ast *enum_
 static void zend_compile_generic_params(zend_ast *params_ast)
 {
 	const zend_ast_list *list = zend_ast_get_list(params_ast);
-	zend_generic_parameter *generic_params = emalloc(list->children * sizeof(zend_generic_parameter));
+	zend_generic_parameter *generic_params = safe_pemalloc(list->children, sizeof(zend_generic_parameter), 0, CG(active_class_entry)->type & ZEND_INTERNAL_CLASS);
 	CG(active_class_entry)->generic_parameters = generic_params;
 
 	for (uint32_t i = 0; i < list->children; i++) {
@@ -9174,7 +9174,6 @@ static void zend_compile_generic_params(zend_ast *params_ast)
 		}
 
 		if (param_ast->child[1]) {
-			// TODO Need to free this?
 			constraint_type = zend_compile_typename(param_ast->child[1]);
 			if (ZEND_TYPE_IS_ASSOCIATED(constraint_type)) {
 				zend_error_noreturn(E_COMPILE_ERROR,

Original file line number	Diff line number	Diff line change
`@@ -9153,7 +9153,7 @@ static void zend_compile_enum_backing_type(zend_class_entry ce, zend_ast enum_`
`9153`	`9153`	`static void zend_compile_generic_params(zend_ast *params_ast)`
`9154`	`9154`	`{`
`9155`	`9155`	`const zend_ast_list *list = zend_ast_get_list(params_ast);`
`9156`		`- zend_generic_parameter generic_params = emalloc(list->children sizeof(zend_generic_parameter));`
	`9156`	`+ zend_generic_parameter *generic_params = safe_pemalloc(list->children, sizeof(zend_generic_parameter), 0, CG(active_class_entry)->type & ZEND_INTERNAL_CLASS);`
`9157`	`9157`	`CG(active_class_entry)->generic_parameters = generic_params;`
`9158`	`9158`
`9159`	`9159`	`for (uint32_t i = 0; i < list->children; i++) {`
`@@ -9174,7 +9174,6 @@ static void zend_compile_generic_params(zend_ast *params_ast)`
`9174`	`9174`	`}`
`9175`	`9175`
`9176`	`9176`	`if (param_ast->child[1]) {`
`9177`		`- // TODO Need to free this?`
`9178`	`9177`	`constraint_type = zend_compile_typename(param_ast->child[1]);`
`9179`	`9178`	`if (ZEND_TYPE_IS_ASSOCIATED(constraint_type)) {`
`9180`	`9179`	`zend_error_noreturn(E_COMPILE_ERROR,`