archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3' into PHP-8.4

Browse source 
* PHP-8.3:
  Prevent resumption of generator suspended in yield from
This commit is contained in:
Arnaud Le Blanc 2025-07-31 08:45:51 +02:00
commit a430ee2dd2
No known key found for this signature in database
3 changed files with 45 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -17,6 +17,8 @@ PHP NEWS
(Arnaud)
. Fixed bug GH-19303 (Unpacking empty packed array into uninitialized array
causes assertion failure). (nielsdos)
. Fixed bug GH-19306 (Generator can be resumed while fetching next value from
delegated Generator). (Arnaud)
- FTP:
. Fix theoretical issues with hrtime() not being available. (nielsdos)

40
Zend/tests/gh19306.phpt Normal file
View file

@ -0,0 +1,40 @@
--TEST--
GH-19306: Generator suspended in yield from may be resumed
--FILE--
<?php
class It implements IteratorAggregate
{
public function getIterator(): Generator
{
yield "";
Fiber::suspend();
}
}
function g()
{
yield from new It();
}
$a = g();
$fiber = new Fiber(function () use ($a) {
echo "Fiber start\n";
$a->next();
echo "Fiber return\n";
});
$fiber->start();
echo "Fiber suspended\n";
try {
$a->next();
} catch (Throwable $t) {
echo $t->getMessage(), "\n";
}
echo "Destroying fiber\n";
$fiber = null;
echo "Shutdown\n";
?>
--EXPECT--
Fiber start
Fiber suspended
Cannot resume an already running generator
Destroying fiber
Shutdown

5
Zend/zend_generators.c
View file

@ -786,6 +786,8 @@ try_again:
orig_generator->execute_fake.prev_execute_data = original_execute_data;
}
generator->flags |= ZEND_GENERATOR_CURRENTLY_RUNNING;
/* Ensure this is run after executor_data swap to have a proper stack trace */
if (UNEXPECTED(!Z_ISUNDEF(generator->values))) {
if (EXPECTED(zend_generator_get_next_delegated_value(generator) == SUCCESS)) {
@ -794,7 +796,7 @@ try_again:
EG(jit_trace_num) = original_jit_trace_num;
orig_generator->flags &= ~(ZEND_GENERATOR_DO_INIT | ZEND_GENERATOR_IN_FIBER);
generator->flags &= ~ZEND_GENERATOR_IN_FIBER;
generator->flags &= ~(ZEND_GENERATOR_CURRENTLY_RUNNING | ZEND_GENERATOR_IN_FIBER);
return;
}
/* If there are no more delegated values, resume the generator
@ -817,7 +819,6 @@ try_again:
* account for the following increment */
|| (generator->flags & ZEND_GENERATOR_FORCED_CLOSE));
generator->execute_data->opline++;
generator->flags |= ZEND_GENERATOR_CURRENTLY_RUNNING;
if (!ZEND_OBSERVER_ENABLED) {
zend_execute_ex(generator->execute_data);
} else {