mirror of
https://github.com/php/php-src.git
synced 2026-03-24 00:02:20 +01:00
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: memory_consumption must be page aligned
This commit is contained in:
@@ -73,7 +73,7 @@ static ZEND_INI_MH(OnUpdateMemoryConsumption)
|
||||
return FAILURE;
|
||||
}
|
||||
if (UNEXPECTED(memsize > ZEND_LONG_MAX / (1024 * 1024))) {
|
||||
*p = ZEND_LONG_MAX;
|
||||
*p = ZEND_LONG_MAX & ~(1024 * 1024 - 1);
|
||||
} else {
|
||||
*p = memsize * (1024 * 1024);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user