diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | Zend/tests/bug52939.phpt | 12 | ||||
| -rw-r--r-- | Zend/zend_execute_API.c | 3 |
3 files changed, 16 insertions, 1 deletions
@@ -39,6 +39,8 @@ in html_entity_decode that had introduced the bug (rev #185591) to other encodings. Additionaly, html_entity_decode() now doesn't decode " if ENT_NOQUOTES is given. (Gustavo) +- Fixed bug #52939 (zend_call_function does not respect ZEND_SEND_PREFER_REF). + (Dmitry) - Fixed bug #52981 (Unicode casing table was out-of-date. Updated with UnicodeData-6.0.0d7.txt and included the source of the generator program with the distribution) (Gustavo). diff --git a/Zend/tests/bug52939.phpt b/Zend/tests/bug52939.phpt index 9810b8063f..91bd27bab5 100644 --- a/Zend/tests/bug52939.phpt +++ b/Zend/tests/bug52939.phpt @@ -10,6 +10,11 @@ $ar1 = array("row1" => 2, "row2" => 1); $args = array(&$ar1); var_dump(call_user_func_array("array_multisort", $args)); var_dump($ar1); + +$ar1 = array("row1" => 2, "row2" => 1); +$args = array($ar1); +var_dump(call_user_func_array("array_multisort", $args)); +var_dump($ar1); ?> --EXPECT-- bool(true) @@ -26,3 +31,10 @@ array(2) { ["row1"]=> int(2) } +bool(true) +array(2) { + ["row1"]=> + int(2) + ["row2"]=> + int(1) +} 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); |