Skip to content

Commit 884e8a9

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
2 parents 8c7aacd + 833b45a commit 884e8a9

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

Zend/tests/fibers/gh10249.phpt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
--TEST--
2+
GH-10249 (Assertion `size >= page_size + 1 * page_size' failed.)
3+
--FILE--
4+
<?php
5+
6+
$callback = function () {};
7+
ini_set("fiber.stack_size", "");
8+
$fiber = new Fiber($callback);
9+
try {
10+
$fiber->start();
11+
} catch (Exception $e) {
12+
echo $e->getMessage() . "\n";
13+
}
14+
15+
?>
16+
--EXPECTF--
17+
Fiber stack size is too small, it needs to be at least %d bytes

Zend/zend_fibers.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,12 @@ static zend_fiber_stack *zend_fiber_stack_allocate(size_t size)
175175
{
176176
void *pointer;
177177
const size_t page_size = zend_fiber_get_page_size();
178+
const size_t minimum_stack_size = page_size + ZEND_FIBER_GUARD_PAGES * page_size;
178179

179-
ZEND_ASSERT(size >= page_size + ZEND_FIBER_GUARD_PAGES * page_size);
180+
if (size < minimum_stack_size) {
181+
zend_throw_exception_ex(NULL, 0, "Fiber stack size is too small, it needs to be at least %zu bytes", minimum_stack_size);
182+
return NULL;
183+
}
180184

181185
const size_t stack_size = (size + page_size - 1) / page_size * page_size;
182186
const size_t alloc_size = stack_size + ZEND_FIBER_GUARD_PAGES * page_size;

0 commit comments

Comments
 (0)