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.2' into PHP-8.3

Browse Source 
* 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
parent 25cb2a40d6 6be3c18d38
commit a1818dd00c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/opcache/zend_shared_alloc.c
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;

2
ext/opcache/zend_shared_alloc.h
View File

@@ -95,7 +95,7 @@ typedef struct _handler_entry {
} zend_shared_memory_handler_entry;
typedef struct _zend_shared_memory_state {
int *positions; /* current positions for each segment */
size_t *positions; /* current positions for each segment */
size_t shared_free; /* amount of free shared memory */
} zend_shared_memory_state;