summaryrefslogtreecommitdiff
path: root/Zend/zend_execute_API.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@php.net>2010-10-13 08:51:39 +0000
committerDmitry Stogov <dmitry@php.net>2010-10-13 08:51:39 +0000
commitb88f7753a1e2429701242c8a231ba76f76dd97bd (patch)
tree44e7ce50ac95d762bea1ee3c8ebded16f4a4ab34 /Zend/zend_execute_API.c
parent14a54b903e952a9f99bf5a4bf4639ab2e105b1c4 (diff)
downloadphp-git-b88f7753a1e2429701242c8a231ba76f76dd97bd.tar.gz
Fixed bug #52939 (zend_call_function does not respect ZEND_SEND_PREFER_REF)
Diffstat (limited to 'Zend/zend_execute_API.c')
-rw-r--r--Zend/zend_execute_API.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 56aee7bf6e..f6604df235 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -870,7 +870,8 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
if (Z_REFCOUNT_PP(fci->params[i]) > 1) {
zval *new_zval;
- if (fci->no_separation) {
+ if (fci->no_separation &&
+ !ARG_MAY_BE_SENT_BY_REF(EX(function_state).function, i + 1)) {
if(i) {
/* hack to clean up the stack */
zend_vm_stack_push_nocheck((void *) (zend_uintptr_t)i TSRMLS_CC);