Use appropriate macros

diff --git a/Zend/zend.c b/Zend/zend.c
index dc0ae2739ba67286ff896eb2a51aa8a22fa79a50..465446d663fe92466f00b0371259a0c08a1fbfac 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -429,7 +429,7 @@ ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int
                                properties->u.v.nApplyCount--;
                                if (is_temp) {
                                        zend_hash_destroy(properties);
-                                       efree(properties);
+                                       FREE_HASHTABLE(properties);
                                }
                                break;
                        }

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 2dc3c22414ff0d1158facdc731e6211678c059f1..b5f9df5d4238c413d402f422b1bab3b877bd0e9a 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -1494,7 +1494,7 @@ void zend_clean_and_cache_symbol_table(zend_array *symbol_table TSRMLS_DC) /* {{
 {
        if (EG(symtable_cache_ptr) >= EG(symtable_cache_limit)) {
                zend_hash_destroy(&symbol_table->ht);
-               efree(symbol_table);
+               FREE_HASHTABLE(symbol_table);
        } else {
                /* clean before putting into the cache, since clean
                   could call dtors, which could use cached hash */

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 3ad4a8cac1ccddd127d7a27558d4accac46994f4..621ad665864db000eeea705a12dd493dc82bcf95 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -359,7 +359,7 @@ void shutdown_executor(TSRMLS_D) /* {{{ */
 
                while (EG(symtable_cache_ptr)>=EG(symtable_cache)) {
                        zend_hash_destroy(&(*EG(symtable_cache_ptr))->ht);
-                       efree(*EG(symtable_cache_ptr));
+                       FREE_HASHTABLE(*EG(symtable_cache_ptr));
                        EG(symtable_cache_ptr)--;
                }
        } zend_end_try();