Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
  Fixed GH-12494: Zend/tests/arginfo_zpp_mismatch.phpt causes a segfault withJIT + --repeat 2
This commit is contained in:
Dmitry Stogov 2023-10-23 10:51:59 +03:00
commit a1818dd00c
2 changed files with 2 additions and 2 deletions

View file

@ -272,7 +272,7 @@ int zend_shared_alloc_startup(size_t requested_size, size_t reserved_size)
free(ZSMMG(shared_segments));
ZSMMG(shared_segments) = tmp_shared_segments;
ZSMMG(shared_memory_state).positions = (int *)zend_shared_alloc(sizeof(int) * ZSMMG(shared_segments_count));
ZSMMG(shared_memory_state).positions = (size_t *)zend_shared_alloc(sizeof(size_t) * ZSMMG(shared_segments_count));
if (!ZSMMG(shared_memory_state).positions) {
zend_accel_error_noreturn(ACCEL_LOG_FATAL, "Insufficient shared memory!");
return ALLOC_FAILURE;