From: Stanislav Malyshev <stas@php.net>
Date: Sun, 27 Jul 2003 12:46:14 +0000 (+0000)
Subject: fix #24635: clean hash before putting into cache
X-Git-Tag: BEFORE_ARG_INFO~78
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c3c136ea4b3fb4bf2fba67dc451c94a82f193ae0;p=php

fix #24635: clean hash before putting into cache
---

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 */