]> granicus.if.org Git - php/commitdiff
Fixed unintended disabling of Optimizer for preloaded scripts introduced by 4a2646cf459
authorDmitry Stogov <dmitry@zend.com>
Tue, 29 Sep 2020 09:11:01 +0000 (12:11 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 29 Sep 2020 09:11:01 +0000 (12:11 +0300)
ext/opcache/ZendAccelerator.c

index b9a0946a5632ede1fcd772b8d015e25e2c001b8e..3da1a5492ec9b0f0326d651592f6280519722067 100644 (file)
@@ -4078,6 +4078,7 @@ static void preload_fix_trait_methods(zend_class_entry *ce)
 static int preload_optimize(zend_persistent_script *script)
 {
        zend_class_entry *ce;
+       zend_persistent_script *tmp_script;
 
        zend_shared_alloc_init_xlat_table();
 
@@ -4087,8 +4088,8 @@ static int preload_optimize(zend_persistent_script *script)
                }
        } ZEND_HASH_FOREACH_END();
 
-       ZEND_HASH_FOREACH_PTR(preload_scripts, script) {
-               ZEND_HASH_FOREACH_PTR(&script->script.class_table, ce) {
+       ZEND_HASH_FOREACH_PTR(preload_scripts, tmp_script) {
+               ZEND_HASH_FOREACH_PTR(&tmp_script->script.class_table, ce) {
                        if (ce->ce_flags & ZEND_ACC_TRAIT) {
                                preload_register_trait_methods(ce);
                        }