Fixed GH-12494: Zend/tests/arginfo_zpp_mismatch.phpt causes a segfaul…

…t withJIT + --repeat 2
php · Oct 23, 2023 · e0ca4dc · iluuu1994 · Oct 23, 2023 · dstogov
1 parent 52aa0d9
commit e0ca4dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ext/opcache/zend_shared_alloc.c b/ext/opcache/zend_shared_alloc.c
@@ -252,7 +252,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;

diff --git a/ext/opcache/zend_shared_alloc.h b/ext/opcache/zend_shared_alloc.h
@@ -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;