diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-04-25 11:54:10 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-04-25 11:54:10 +0400 |
| commit | 4e7cbf3f5842abe6688c11ce3cc11d2eabf0695f (patch) | |
| tree | 1ae6368f4c51a8fccc1766655bf8ef74b0badffe | |
| parent | 2c39cf670c3dacad8ceb468dc2765ee6756676f2 (diff) | |
| download | php-git-4e7cbf3f5842abe6688c11ce3cc11d2eabf0695f.tar.gz | |
Use appropriate macros
| -rw-r--r-- | Zend/zend.c | 2 | ||||
| -rw-r--r-- | Zend/zend_execute.c | 2 | ||||
| -rw-r--r-- | Zend/zend_execute_API.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index dc0ae2739b..465446d663 100644 --- 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 2dc3c22414..b5f9df5d42 100644 --- 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 3ad4a8cac1..621ad66586 100644 --- 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(); |