clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed pass by reference special cases

Browse Source
This commit is contained in:
Dmitry Stogov 2014-03-07 16:45:32 +04:00
parent 6d67dd3103
commit e9855b1992
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Zend/zend_vm_def.h
View File

@ -3097,9 +3097,10 @@ ZEND_VM_HANDLER(106, ZEND_SEND_VAR_NO_REF, VAR|CV, ANY)
varptr = GET_OP1_ZVAL_PTR(BP_VAR_R);
if ((!(opline->extended_value & ZEND_ARG_SEND_FUNCTION) ||
(varptr->var_flags & IS_VAR_RET_REF)) &&
(!Z_REFCOUNTED_P(varptr) ||
((!Z_REFCOUNTED_P(varptr) && Z_TYPE_P(varptr) != IS_STRING) ||
Z_ISREF_P(varptr) ||
Z_REFCOUNT_P(varptr) == 1)) {
Z_TYPE_P(varptr) == IS_OBJECT ||
(Z_REFCOUNTED_P(varptr) && Z_REFCOUNT_P(varptr) == 1))) {
if (Z_ISREF_P(varptr)) {
if (OP1_TYPE == IS_CV) {

10
Zend/zend_vm_execute.h
View File

@ -12909,9 +12909,10 @@ static int ZEND_FASTCALL ZEND_SEND_VAR_NO_REF_SPEC_VAR_HANDLER(ZEND_OPCODE_HAND
varptr = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
if ((!(opline->extended_value & ZEND_ARG_SEND_FUNCTION) ||
(varptr->var_flags & IS_VAR_RET_REF)) &&
(!Z_REFCOUNTED_P(varptr) ||
((!Z_REFCOUNTED_P(varptr) && Z_TYPE_P(varptr) != IS_STRING) ||
Z_ISREF_P(varptr) ||
Z_REFCOUNT_P(varptr) == 1)) {
Z_TYPE_P(varptr) == IS_OBJECT ||
(Z_REFCOUNTED_P(varptr) && Z_REFCOUNT_P(varptr) == 1))) {
if (Z_ISREF_P(varptr)) {
if (IS_VAR == IS_CV) {
@ -30292,9 +30293,10 @@ static int ZEND_FASTCALL ZEND_SEND_VAR_NO_REF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDL
varptr = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var TSRMLS_CC);
if ((!(opline->extended_value & ZEND_ARG_SEND_FUNCTION) ||
(varptr->var_flags & IS_VAR_RET_REF)) &&
(!Z_REFCOUNTED_P(varptr) ||
((!Z_REFCOUNTED_P(varptr) && Z_TYPE_P(varptr) != IS_STRING) ||
Z_ISREF_P(varptr) ||
Z_REFCOUNT_P(varptr) == 1)) {
Z_TYPE_P(varptr) == IS_OBJECT ||
(Z_REFCOUNTED_P(varptr) && Z_REFCOUNT_P(varptr) == 1))) {
if (Z_ISREF_P(varptr)) {
if (IS_CV == IS_CV) {