Merge branch 'PHP-8.2' into PHP-8.3

cmb69 · cmb69 · commit 41d75f42ecf1 · 2024-10-12T22:48:46.000+02:00
* PHP-8.2: Fix phpGH-16388: UB when freeing a cloned _ZendTestFiber
diff --git a/ext/zend_test/fiber.c b/ext/zend_test/fiber.c
@@ -352,4 +352,5 @@ void zend_test_fiber_init(void)
 	zend_test_fiber_handlers = std_object_handlers;
 	zend_test_fiber_handlers.dtor_obj = zend_test_fiber_object_destroy;
 	zend_test_fiber_handlers.free_obj = zend_test_fiber_object_free;
+	zend_test_fiber_handlers.clone_obj = NULL;
 }
diff --git a/ext/zend_test/tests/gh16388.phpt b/ext/zend_test/tests/gh16388.phpt
@@ -0,0 +1,12 @@
+--TEST--
+GH-16388 (UB when freeing a cloned _ZendTestFiber)
+--EXTENSIONS--
+zend_test
+--FILE--
+<?php
+$fiber = new _ZendTestFiber(function (): int {});
+clone $fiber;
+?>
+--EXPECTF--
+Fatal error: Uncaught Error: Trying to clone an uncloneable object of class _ZendTestFiber in %s:%d
+%A

Original file line number	Diff line number	Diff line change
`@@ -352,4 +352,5 @@ void zend_test_fiber_init(void)`
`352`	`352`	`zend_test_fiber_handlers = std_object_handlers;`
`353`	`353`	`zend_test_fiber_handlers.dtor_obj = zend_test_fiber_object_destroy;`
`354`	`354`	`zend_test_fiber_handlers.free_obj = zend_test_fiber_object_free;`
	`355`	`+ zend_test_fiber_handlers.clone_obj = NULL;`
`355`	`356`	`}`