Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
  memory_consumption must be page aligned
This commit is contained in:
Dmitry Stogov 2023-10-23 12:11:01 +03:00
commit 1f25dea498

View file

@ -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);
}