diff options
| author | Xinchen Hui <laruence@php.net> | 2015-08-18 21:45:19 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-08-18 21:45:19 +0800 |
| commit | e543769fa44fada6883537ab6684a993f45de3d9 (patch) | |
| tree | 61b1bcd55b35d3fd68d48a6f7cc49b0003fda2dc /Zend/zend_vm_execute.h | |
| parent | 34834c58fac070fe9fd8b0e595f6fad7993a3c68 (diff) | |
| download | php-git-e543769fa44fada6883537ab6684a993f45de3d9.tar.gz | |
Fixed bug #70288 (Apache crash related to ZEND_SEND_REF)
Diffstat (limited to 'Zend/zend_vm_execute.h')
| -rw-r--r-- | Zend/zend_vm_execute.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index cf1c7a1e8f..043dc32325 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -15270,9 +15270,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_REF_SPEC_VAR_HANDLER(ZEND if (Z_ISREF_P(varptr)) { Z_ADDREF_P(varptr); ZVAL_COPY_VALUE(arg, varptr); - } else if (IS_VAR == IS_VAR && - UNEXPECTED(Z_TYPE_P(EX_VAR(opline->op1.var)) != IS_INDIRECT)) { - ZVAL_NEW_REF(arg, varptr); } else { ZVAL_NEW_REF(arg, varptr); Z_ADDREF_P(arg); @@ -28658,9 +28655,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_REF_SPEC_CV_HANDLER(ZEND_ if (Z_ISREF_P(varptr)) { Z_ADDREF_P(varptr); ZVAL_COPY_VALUE(arg, varptr); - } else if (IS_CV == IS_VAR && - UNEXPECTED(Z_TYPE_P(EX_VAR(opline->op1.var)) != IS_INDIRECT)) { - ZVAL_NEW_REF(arg, varptr); } else { ZVAL_NEW_REF(arg, varptr); Z_ADDREF_P(arg); |