diff options
| author | Stanislav Malyshev <stas@php.net> | 2003-07-27 12:46:14 +0000 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2003-07-27 12:46:14 +0000 |
| commit | c3c136ea4b3fb4bf2fba67dc451c94a82f193ae0 (patch) | |
| tree | bb9fcd15047a6001d1a6fc96f255103a570488b2 | |
| parent | 399db3c846993416245eb5da9a676b85bbc1cee5 (diff) | |
| download | php-git-c3c136ea4b3fb4bf2fba67dc451c94a82f193ae0.tar.gz | |
fix #24635: clean hash before putting into cache
| -rw-r--r-- | Zend/zend_execute.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 0b394d758a..9baab66271 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 */ |