Fix zend_enum_new refcount api break

iluuu1994 · iluuu1994 · commit cedd3ea941fd · 2022-05-28T17:05:20.000+02:00
diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c
@@ -789,6 +789,9 @@ ZEND_API zend_result ZEND_FASTCALL zend_ast_evaluate(zval *result, zend_ast *ast
 
 			zend_class_entry *ce = zend_lookup_class(class_name);
 			zend_enum_new(result, ce, case_name, case_value_zv_ptr);
+			if (case_value_zv_ptr != NULL) {
+				Z_TRY_DELREF_P(case_value_zv_ptr);
+			}
 			break;
 		}
 		case ZEND_AST_CLASS_CONST:
diff --git a/Zend/zend_enum.c b/Zend/zend_enum.c
@@ -42,7 +42,7 @@ zend_object *zend_enum_new(zval *result, zend_class_entry *ce, zend_string *case
 
 	ZVAL_STR_COPY(OBJ_PROP_NUM(zobj, 0), case_name);
 	if (backing_value_zv != NULL) {
-		ZVAL_COPY_VALUE(OBJ_PROP_NUM(zobj, 1), backing_value_zv);
+		ZVAL_COPY(OBJ_PROP_NUM(zobj, 1), backing_value_zv);
 	}
 
 	zobj->handlers = &enum_handlers;

Original file line number	Diff line number	Diff line change
`@@ -789,6 +789,9 @@ ZEND_API zend_result ZEND_FASTCALL zend_ast_evaluate(zval result, zend_ast ast`
`789`	`789`
`790`	`790`	`zend_class_entry *ce = zend_lookup_class(class_name);`
`791`	`791`	`zend_enum_new(result, ce, case_name, case_value_zv_ptr);`
	`792`	`+ if (case_value_zv_ptr != NULL) {`
	`793`	`+ Z_TRY_DELREF_P(case_value_zv_ptr);`
	`794`	`+ }`
`792`	`795`	`break;`
`793`	`796`	`}`
`794`	`797`	`case ZEND_AST_CLASS_CONST:`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ zend_object zend_enum_new(zval result, zend_class_entry ce, zend_string case`
`42`	`42`
`43`	`43`	`ZVAL_STR_COPY(OBJ_PROP_NUM(zobj, 0), case_name);`
`44`	`44`	`if (backing_value_zv != NULL) {`
`45`		`- ZVAL_COPY_VALUE(OBJ_PROP_NUM(zobj, 1), backing_value_zv);`
	`45`	`+ ZVAL_COPY(OBJ_PROP_NUM(zobj, 1), backing_value_zv);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`zobj->handlers = &enum_handlers;`