Fix GH-10437: Set active fiber to null on bailout #10443

trowski · 2023-01-25T01:18:13Z

A bailout in a fiber is not setting the active fiber to NULL, causing Fiber::getCurrent() to return a bogus Fiber object from {main} in a shutdown function.

This is a simple fix, setting EG(active_fiber) to NULL before forwarding the bailout.

devnexen

LCTM

* PHP-8.1: Fix GH-10437: Set active fiber to null on bailout (#10443)

* PHP-8.2: [ci skip] NEWS Fix GH-10437: Set active fiber to null on bailout (#10443)

trowski added the Category: Fibers label Jan 25, 2023

trowski mentioned this pull request Jan 25, 2023

Fix GH-10437: Segfault on suspending a dead fiber #10438

Closed

trowski requested a review from devnexen January 25, 2023 18:16

devnexen approved these changes Jan 25, 2023

View reviewed changes

Fix phpGH-10437: Set active fiber to null on bailout

5232733

trowski force-pushed the gh-10437 branch from 87ddddc to 5232733 Compare January 28, 2023 16:12

trowski merged commit 284c293 into php:PHP-8.1 Jan 28, 2023

trowski added a commit that referenced this pull request Jan 28, 2023

Merge branch 'PHP-8.1' into PHP-8.2

0c4aee4

* PHP-8.1: Fix GH-10437: Set active fiber to null on bailout (#10443)

trowski added a commit that referenced this pull request Jan 28, 2023

Merge branch 'PHP-8.2'

ff84598

* PHP-8.2: [ci skip] NEWS Fix GH-10437: Set active fiber to null on bailout (#10443)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix GH-10437: Set active fiber to null on bailout #10443

Fix GH-10437: Set active fiber to null on bailout #10443

trowski commented Jan 25, 2023

devnexen left a comment

Fix GH-10437: Set active fiber to null on bailout #10443

Fix GH-10437: Set active fiber to null on bailout #10443

Conversation

trowski commented Jan 25, 2023

devnexen left a comment

Choose a reason for hiding this comment