Commit cc50d4823c3 for php
commit cc50d4823c307f619dec56fbd4ad629b945db4f0
Merge: a68a2b8edc8 204a181165b
Author: David Carlier <devnexen@gmail.com>
Date: Wed Nov 18 06:12:59 2026 +0000
Merge branch 'PHP-8.5' into PHP-8.6
* PHP-8.5:
ext/spl: Fix leak of the static variables of a file loaded by spl_autoload()
diff --cc ext/spl/php_spl.c
index a3b0bfbe770,fdb01b3f08d..8d516c1543f
--- a/ext/spl/php_spl.c
+++ b/ext/spl/php_spl.c
@@@ -290,11 -262,16 +290,12 @@@ static bool spl_autoload(zend_string *l
zend_execute(new_op_array, &result);
EG(jit_trace_num) = orig_jit_trace_num;
+ zend_destroy_static_vars(new_op_array);
destroy_op_array(new_op_array);
efree(new_op_array);
- if (!EG(exception)) {
- zval_ptr_dtor(&result);
- }
+ zval_ptr_dtor(&result);
- zend_destroy_file_handle(&file_handle);
- zend_string_release(class_file);
- return zend_hash_exists(EG(class_table), lc_name);
+ ret = zend_hash_exists(EG(class_table), lc_name);
}
}
zend_destroy_file_handle(&file_handle);