com php-src: Fixed incinsitency in passing arguments by reference to call_user_func(): Zend/zend_vm_def.h Zend/z end_vm_execute.h

Commit: 70fb0e751913a408e7906adba8bcaff08da44e9e Author: Dmitry Stogov <dmitry@zend.com> Tue, 29 Jul 2014 20:27:48 +0400 Parents: dda7e84f10bffb0eca57754e682530988edab235 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=70fb0e751913a408e7906adba8bcaff08da44e9e Log: Fixed incinsitency in passing arguments by reference to call_user_func() Changed paths: M Zend/zend_vm_def.h M Zend/zend_vm_execute.h Diff: diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index c2b2264..e4ba959 100644 --- 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 8582323..761f4c6 100644 --- 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)) {