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
commitf4173a8ece11a20ac09dc68e7cee746f741750b2 (patch)
tree7c694e01214402791422381929a1aa7eb136aba1 /Zend/zend_execute_API.c
parenta1888f585c5b09433906fc59b781296cb693880e (diff)
downloadphp-git-f4173a8ece11a20ac09dc68e7cee746f741750b2.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 1f1a2b13d9..5f64c4dcb8 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -854,7 +854,8 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
if (!PZVAL_IS_REF(*fci->params[i]) && 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);