Fixed incinsitency in passing arguments by reference to call_user_func()

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index c2b226436ff1def872ef2d572057afde39c387cf..e4ba9597a689fd334ca0a9138b716909213c8acf 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -3471,7 +3471,7 @@ ZEND_VM_HANDLER(120, ZEND_SEND_USER, VAR|CV, ANY)
                        // This solution breaks the following test (emit warning message) ???
                        // ext/pdo_sqlite/tests/pdo_005.phpt
 #endif
-                   (!Z_ISREF_P(arg) && Z_REFCOUNT_P(arg) > 1)) {
+                   (!Z_ISREF_P(arg) /*&& Z_REFCOUNT_P(arg) > 1???*/)) {
 
                        if (!ARG_MAY_BE_SENT_BY_REF(EX(call)->func, opline->op2.num)) {
 

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 8582323e1a5ccabe21026870444791ab422161f9..761f4c630c11c5cd71e7710a5db88de9c0555f0f 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -13634,7 +13634,7 @@ static int ZEND_FASTCALL  ZEND_SEND_USER_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_AR
                        // This solution breaks the following test (emit warning message) ???
                        // ext/pdo_sqlite/tests/pdo_005.phpt
 #endif
-                   (!Z_ISREF_P(arg) && Z_REFCOUNT_P(arg) > 1)) {
+                   (!Z_ISREF_P(arg) /*&& Z_REFCOUNT_P(arg) > 1???*/)) {
 
                        if (!ARG_MAY_BE_SENT_BY_REF(EX(call)->func, opline->op2.num)) {
 
@@ -30988,7 +30988,7 @@ static int ZEND_FASTCALL  ZEND_SEND_USER_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARG
                        // This solution breaks the following test (emit warning message) ???
                        // ext/pdo_sqlite/tests/pdo_005.phpt
 #endif
-                   (!Z_ISREF_P(arg) && Z_REFCOUNT_P(arg) > 1)) {
+                   (!Z_ISREF_P(arg) /*&& Z_REFCOUNT_P(arg) > 1???*/)) {
 
                        if (!ARG_MAY_BE_SENT_BY_REF(EX(call)->func, opline->op2.num)) {