php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-09 09:03:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2'

Browse Source
This commit is contained in:
Bob Weinand
2023-01-30 12:33:23 +01:00
parent 1679235f0f f732486c08
commit 8076ca2bcf
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Zend/tests/fibers/get-return-after-bailout.phpt
View File

@@ -1,5 +1,12 @@
--TEST--
Fiber::getReturn() after bailout
--SKIPIF--
<?php
$zend_mm_enabled = getenv("USE_ZEND_ALLOC");
if ($zend_mm_enabled === "0") {
die("skip Zend MM disabled");
}
?>
--FILE--
<?php

7
Zend/tests/generators/gh9801.phpt
View File

@@ -2,6 +2,13 @@
Bug GH-9801 (Crash when memory limit is exceeded during generator initialization)
--INI--
memory_limit=16m
--SKIPIF--
<?php
$zend_mm_enabled = getenv("USE_ZEND_ALLOC");
if ($zend_mm_enabled === "0") {
die("skip Zend MM disabled");
}
?>
--FILE--
<?php

2
Zend/zend_generators.c
View File

@@ -225,7 +225,7 @@ static void zend_generator_dtor_storage(zend_object *object) /* {{{ */
/* Generator is running in a suspended fiber.
* Will be dtor during fiber dtor */
if (generator->flags & ZEND_GENERATOR_IN_FIBER) {
if (zend_generator_get_current(generator)->flags & ZEND_GENERATOR_IN_FIBER) {
/* Prevent finally blocks from yielding */
generator->flags |= ZEND_GENERATOR_FORCED_CLOSE;
return;