summaryrefslogtreecommitdiff
path: root/Zend/zend_execute_API.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2014-07-31 10:51:49 +0400
committerDmitry Stogov <dmitry@zend.com>2014-07-31 10:51:49 +0400
commitc201ba8fffd967b9cc5dcf18bd46cc9d025cb955 (patch)
treea702c922636c2949dc6cfc93810dd78375f5b8a1 /Zend/zend_execute_API.c
parentf693cf8e66ca29625dc04a587263f7f03c066e53 (diff)
downloadphp-git-c201ba8fffd967b9cc5dcf18bd46cc9d025cb955.tar.gz
execute_data->return_value should be initialized when call internal constructors
Diffstat (limited to 'Zend/zend_execute_API.c')
-rw-r--r--Zend/zend_execute_API.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 308d54b31d..9e9bd841a0 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -859,6 +859,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
EG(scope) = func->common.scope;
}
call->prev_execute_data = EG(current_execute_data);
+ call->return_value = NULL; /* this is not a constructor call */
EG(current_execute_data) = call;
if (EXPECTED(zend_execute_internal == NULL)) {
/* saves one function call if zend_execute_internal is not used */