com php-src: Fixed string deallocation and code cleanup: Zend/zend_execute_API.c
| From: | Dmitry Stogov | Date: | Mon, 23 Jun 2014 13:01:59 +0000 |
| Subject: | com php-src: Fixed string deallocation and code cleanup: Zend/zend_execute_API.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79023@lists.php.net to get a copy of this message | ||
Commit: bbc508dea595ef297f2201486078b38e4b7e98fd
Author: Dmitry Stogov <dmitry@zend.com> Mon, 23 Jun 2014 17:01:59 +0400
Parents: 56a966e88a98bf04b2cd253b9b18136c0cc4028b
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bbc508dea595ef297f2201486078b38e4b7e98fd
Log:
Fixed string deallocation and code cleanup
Changed paths:
M Zend/zend_execute_API.c
Diff:
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 5dce629..ebb995a 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -580,7 +580,6 @@ ZEND_API int zval_update_constant_ex(zval *p, zend_bool inline_change, zend_clas
if (inline_change) {
STR_RELEASE(Z_STR_P(p));
}
-//???!
ZVAL_COPY_VALUE(p, const_value);
if (Z_OPT_CONSTANT_P(p)) {
zval_update_constant_ex(p, 1, NULL TSRMLS_CC);
@@ -887,7 +886,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
}
if (EX(function_state).function->type == ZEND_OVERLOADED_FUNCTION_TEMPORARY) {
- efree((char*)EX(function_state).function->common.function_name);
+ STR_RELEASE(EX(function_state).function->common.function_name);
}
efree(EX(function_state).function);