Address review concerns

Signed-off-by: Bob Weinand <[email protected]>

Author: bwoebi

Zend/zend_map_ptr.h

@@ -70,7 +70,7 @@ typedef struct _zend_string zend_string;
 	} while (0)
 # define ZEND_MAP_PTR_BIASED_BASE(real_base) \
 	((void*)(((uintptr_t)(real_base)) + zend_map_ptr_static_size * sizeof(void *) - 1))
-// Note: chunked like: [8192..12287][4096..8191][0..4095]
+/* Note: chunked like: [8192..12287][4096..8191][0..4095] */
 #define ZEND_MAP_PTR_STATIC_NUM_TO_PTR(num) \
 	((void **)CG(map_ptr_real_base) + zend_map_ptr_static_size - ZEND_MM_ALIGNED_SIZE_EX((num) + 1, 4096) + ((num) & 4095))
 #else

ext/opcache/ZendAccelerator.c

@@ -4374,7 +4374,7 @@ static void preload_load(size_t orig_map_ptr_static_last)
 			CG(map_ptr_real_base) = new_base;
 			zend_map_ptr_static_size = new_static_size;
 		} else {
-			CG(map_ptr_real_base) = perealloc(CG(map_ptr_real_base), CG(map_ptr_size) * sizeof(void *), 1);
+			CG(map_ptr_real_base) = perealloc(CG(map_ptr_real_base), (zend_map_ptr_static_size + CG(map_ptr_size)) * sizeof(void *), 1);
 		}
 
 		memset((void **) CG(map_ptr_real_base) + zend_map_ptr_static_size + old_map_ptr_last, 0, (CG(map_ptr_last) - old_map_ptr_last) * sizeof(void *));

ext/opcache/ZendAccelerator.h

@@ -254,6 +254,7 @@ typedef struct _zend_accel_shared_globals {
 	zend_accel_hash hash;             /* hash table for cached scripts */
 
 	size_t map_ptr_last;
+    size_t map_ptr_static_last;
 
 	/* Directives & Maintenance */
 	time_t          start_time;
@@ -281,8 +282,6 @@ typedef struct _zend_accel_shared_globals {
 	void *jit_traces;
 	const void **jit_exit_groups;
 
-	size_t map_ptr_static_last;
-
 	/* Interned Strings Support (must be the last element) */
 	ZEND_SET_ALIGNED(ZEND_STRING_TABLE_POS_ALIGNMENT, zend_string_table interned_strings);
 } zend_accel_shared_globals;