summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2014-06-23 17:01:59 +0400
committerDmitry Stogov <dmitry@zend.com>2014-06-23 17:01:59 +0400
commitbbc508dea595ef297f2201486078b38e4b7e98fd (patch)
treea3c71a9dce957419555d8c2292498a0fb863fa51
parent56a966e88a98bf04b2cd253b9b18136c0cc4028b (diff)
downloadphp-git-bbc508dea595ef297f2201486078b38e4b7e98fd.tar.gz
Fixed string deallocation and code cleanup
-rw-r--r--Zend/zend_execute_API.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 5dce62992d..ebb995a262 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);