Fix preloading edge case

Author: nikic

ext/opcache/zend_persist.c

@@ -637,20 +637,26 @@ static void zend_persist_op_array_ex(zend_op_array *op_array, zend_persistent_sc
 static void zend_persist_op_array(zval *zv)
 {
 	zend_op_array *op_array = Z_PTR_P(zv);
-
+	zend_op_array *old_op_array;
 	ZEND_ASSERT(op_array->type == ZEND_USER_FUNCTION);
-	op_array = Z_PTR_P(zv) = zend_shared_memdup(Z_PTR_P(zv), sizeof(zend_op_array));
-	zend_persist_op_array_ex(op_array, NULL);
-	if (!ZCG(current_persistent_script)->corrupted) {
-		op_array->fn_flags |= ZEND_ACC_IMMUTABLE;
-		ZEND_MAP_PTR_NEW(op_array->run_time_cache);
-		if (op_array->static_variables) {
-			ZEND_MAP_PTR_NEW(op_array->static_variables_ptr);
+
+	old_op_array = zend_shared_alloc_get_xlat_entry(op_array);
+	if (!old_op_array) {
+		op_array = Z_PTR_P(zv) = zend_shared_memdup_put(Z_PTR_P(zv), sizeof(zend_op_array));
+		zend_persist_op_array_ex(op_array, NULL);
+		if (!ZCG(current_persistent_script)->corrupted) {
+			op_array->fn_flags |= ZEND_ACC_IMMUTABLE;
+			ZEND_MAP_PTR_NEW(op_array->run_time_cache);
+			if (op_array->static_variables) {
+				ZEND_MAP_PTR_NEW(op_array->static_variables_ptr);
+			}
+		} else {
+			ZEND_MAP_PTR_INIT(op_array->run_time_cache, ZCG(arena_mem));
+			ZCG(arena_mem) = (void*)(((char*)ZCG(arena_mem)) + ZEND_ALIGNED_SIZE(sizeof(void*)));
+			ZEND_MAP_PTR_SET(op_array->run_time_cache, NULL);
 		}
 	} else {
-		ZEND_MAP_PTR_INIT(op_array->run_time_cache, ZCG(arena_mem));
-		ZCG(arena_mem) = (void*)(((char*)ZCG(arena_mem)) + ZEND_ALIGNED_SIZE(sizeof(void*)));
-		ZEND_MAP_PTR_SET(op_array->run_time_cache, NULL);
+		/* This can happen during preloading, if a dynamic function definition is declared. */
 	}
 }
 

ext/opcache/zend_persist_calc.c

@@ -299,12 +299,17 @@ static void zend_persist_op_array_calc_ex(zend_op_array *op_array)
 static void zend_persist_op_array_calc(zval *zv)
 {
 	zend_op_array *op_array = Z_PTR_P(zv);
-
 	ZEND_ASSERT(op_array->type == ZEND_USER_FUNCTION);
-	ADD_SIZE(sizeof(zend_op_array));
-	zend_persist_op_array_calc_ex(Z_PTR_P(zv));
-	if (ZCG(current_persistent_script)->corrupted) {
-		ADD_ARENA_SIZE(sizeof(void*));
+
+	if (!zend_shared_alloc_get_xlat_entry(op_array)) {
+		zend_shared_alloc_register_xlat_entry(op_array, op_array);
+		ADD_SIZE(sizeof(zend_op_array));
+		zend_persist_op_array_calc_ex(op_array);
+		if (ZCG(current_persistent_script)->corrupted) {
+			ADD_ARENA_SIZE(sizeof(void*));
+		}
+	} else {
+		/* This can happen during preloading, if a dynamic function definition is declared. */
 	}
 }