Skip to content

Commit 0c4aee4

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Fix GH-10437: Set active fiber to null on bailout (#10443)
2 parents cfb6e82 + 284c293 commit 0c4aee4

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

Zend/tests/fibers/gh10437.phpt

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
--TEST--
2+
GH-10437 (Segfault/assertion when using fibers in shutdown function after bailout)
3+
--FILE--
4+
<?php
5+
6+
register_shutdown_function(function (): void {
7+
var_dump(Fiber::getCurrent());
8+
});
9+
10+
$fiber = new Fiber(function (): never {
11+
trigger_error('Bailout in fiber', E_USER_ERROR);
12+
});
13+
$fiber->start();
14+
15+
?>
16+
--EXPECTF--
17+
Fatal error: Bailout in fiber in %sgh10437.php on line %d
18+
NULL

Zend/zend_fibers.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -561,6 +561,7 @@ static zend_always_inline zend_fiber_transfer zend_fiber_switch_to(
561561

562562
/* Forward bailout into current fiber. */
563563
if (UNEXPECTED(transfer.flags & ZEND_FIBER_TRANSFER_FLAG_BAILOUT)) {
564+
EG(active_fiber) = NULL;
564565
zend_bailout();
565566
}
566567

0 commit comments

Comments
 (0)