Fixed incorrect reallocation

dstogov · dstogov · commit a0a1c8990ede · 2018-10-17T17:44:03.000+03:00
diff --git a/ext/opcache/zend_accelerator_util_funcs.c b/ext/opcache/zend_accelerator_util_funcs.c
@@ -178,7 +178,9 @@ static void zend_hash_clone_methods(HashTable *ht, HashTable *source, zend_class
 					new_entry->prototype = ARENA_REALLOC(new_entry->prototype);
 				}
 			}
-			ZEND_MAP_PTR_INIT(new_entry->run_time_cache, ARENA_REALLOC(ZEND_MAP_PTR(new_entry->run_time_cache)));
+			if (IN_ARENA(ZEND_MAP_PTR(new_entry->run_time_cache))) {
+				ZEND_MAP_PTR_INIT(new_entry->run_time_cache, ARENA_REALLOC(ZEND_MAP_PTR(new_entry->run_time_cache)));
+			}
 			ZEND_MAP_PTR_INIT(new_entry->static_variables_ptr, &new_entry->static_variables);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,9 @@ static void zend_hash_clone_methods(HashTable ht, HashTable source, zend_class`
`178`	`178`	`new_entry->prototype = ARENA_REALLOC(new_entry->prototype);`
`179`	`179`	`}`
`180`	`180`	`}`
`181`		`- ZEND_MAP_PTR_INIT(new_entry->run_time_cache, ARENA_REALLOC(ZEND_MAP_PTR(new_entry->run_time_cache)));`
	`181`	`+ if (IN_ARENA(ZEND_MAP_PTR(new_entry->run_time_cache))) {`
	`182`	`+ ZEND_MAP_PTR_INIT(new_entry->run_time_cache, ARENA_REALLOC(ZEND_MAP_PTR(new_entry->run_time_cache)));`
	`183`	`+ }`
`182`	`184`	`ZEND_MAP_PTR_INIT(new_entry->static_variables_ptr, &new_entry->static_variables);`
`183`	`185`	`}`
`184`	`186`	`}`