diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-07-29 20:27:48 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-07-29 20:27:48 +0400 |
| commit | 70fb0e751913a408e7906adba8bcaff08da44e9e (patch) | |
| tree | 96d1200eef14cc81f88636d953c6bee9a8c7a15e /Zend | |
| parent | dda7e84f10bffb0eca57754e682530988edab235 (diff) | |
| download | php-git-70fb0e751913a408e7906adba8bcaff08da44e9e.tar.gz | |
Fixed incinsitency in passing arguments by reference to call_user_func()
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_vm_def.h | 2 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index c2b226436f..e4ba9597a6 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 8582323e1a..761f4c630c 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)) { |