From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 4 Mar 2021 15:15:05 +0000 (+0100)
Subject: Fix dynamic func def persist with preloading
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=97de8cfc710c51bc19ed504d5caeec83db5a3f8d;p=php

Fix dynamic func def persist with preloading

If we find an existing serialization of the op_array, of course
we also need to actually make use of it...
---

diff --git a/ext/opcache/zend_persist.c b/ext/opcache/zend_persist.c
index 6688e473cb..19bc1ce7ad 100644
--- a/ext/opcache/zend_persist.c
+++ b/ext/opcache/zend_persist.c
@@ -704,6 +704,7 @@ static void zend_persist_op_array(zval *zv)
 		}
 	} else {
 		/* This can happen during preloading, if a dynamic function definition is declared. */
+		Z_PTR_P(zv) = old_op_array;
 	}
 }