From c3c136ea4b3fb4bf2fba67dc451c94a82f193ae0 Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Sun, 27 Jul 2003 12:46:14 +0000 Subject: [PATCH] fix #24635: clean hash before putting into cache --- Zend/zend_execute.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 0b394d758a8..9baab66271a 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -2555,8 +2555,10 @@ int zend_do_fcall_common_helper(ZEND_OPCODE_HANDLER_ARGS) zend_hash_destroy(EX(function_state).function_symbol_table); FREE_HASHTABLE(EX(function_state).function_symbol_table); } else { - *(++EG(symtable_cache_ptr)) = EX(function_state).function_symbol_table; + /* clean before putting into the cache, since clean + could call dtors, which could use cached hash */ zend_hash_clean(*EG(symtable_cache_ptr)); + *(++EG(symtable_cache_ptr)) = EX(function_state).function_symbol_table; } EG(active_symbol_table) = calling_symbol_table; } else { /* ZEND_OVERLOADED_FUNCTION */