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

Merge branch 'PHP-8.1' into PHP-8.2

Browse Source 
* PHP-8.1:
  Fixed GH-12564: The negative fiber.stack_size setting leads to crash
This commit is contained in:
Dmitry Stogov
2023-11-01 16:26:32 +03:00
parent 125dbb2c03 fe3a819e32
commit 9096ba9917
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Zend/tests/fibers/negative_stack_size.phpt Normal file
View File

@@ -0,0 +1,16 @@
--TEST--
fiber.stack_size must be a positive number
--FILE--
<?php
ini_set("fiber.stack_size","-1");
$fiber = new Fiber(function() {});
try {
$fiber->start();
} catch (Throwable $e) {
echo "Exception: " . $e->getMessage()."\n";
}
?>
DONE
--EXPECTF--
Warning: fiber.stack_size must be a positive number in %snegative_stack_size.php on line 2
DONE

7
Zend/zend.c
View File

@@ -177,7 +177,12 @@ static ZEND_INI_MH(OnSetExceptionStringParamMaxLen) /* {{{ */
static ZEND_INI_MH(OnUpdateFiberStackSize) /* {{{ */
{
if (new_value) {
EG(fiber_stack_size) = zend_ini_parse_quantity_warn(new_value, entry->name);
zend_long tmp = zend_ini_parse_quantity_warn(new_value, entry->name);
if (tmp < 0) {
zend_error(E_WARNING, "fiber.stack_size must be a positive number");
return FAILURE;
}
EG(fiber_stack_size) = tmp;
} else {
EG(fiber_stack_size) = ZEND_FIBER_DEFAULT_C_STACK_SIZE;
}