summaryrefslogtreecommitdiff
path: root/Zend/zend_execute_API.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2014-03-06 13:32:43 +0400
committerDmitry Stogov <dmitry@zend.com>2014-03-06 13:32:43 +0400
commit8d2fb9d479bf13381d67e400e3b8c7aa28d7a480 (patch)
tree91d2a428383c748d2be9d9c8ee93ce24ead6227c /Zend/zend_execute_API.c
parent9ae9460bd09b6216cad14c0130b0951626d8b671 (diff)
downloadphp-git-8d2fb9d479bf13381d67e400e3b8c7aa28d7a480.tar.gz
Internal functions may return (e.g. on wrong arguments) keeping the original return_value. So we have to initialize return_value as IS_NULL.
Diffstat (limited to 'Zend/zend_execute_API.c')
-rw-r--r--Zend/zend_execute_API.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index fb214dba10..7ddb526421 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -932,7 +932,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
EG(opline_ptr) = original_opline_ptr;
} else if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION) {
int call_via_handler = (EX(function_state).function->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER) != 0;
-//??? ALLOC_INIT_ZVAL(*fci->retval_ptr_ptr);
+ ZVAL_NULL(fci->retval);
if (EX(function_state).function->common.scope) {
EG(scope) = EX(function_state).function->common.scope;
}