com php-src: Fixed pass by reference special cases: Zend/zend_vm_def.h Zend/zend_vm_execute.h
| From: | Dmitry Stogov | Date: | Fri, 07 Mar 2014 12:45:32 +0000 |
| Subject: | com php-src: Fixed pass by reference special cases: Zend/zend_vm_def.h Zend/zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77681@lists.php.net to get a copy of this message | ||
Commit: e9855b199263c452c0be2d32752c848da54a95fd
Author: Dmitry Stogov <dmitry@zend.com> Fri, 7 Mar 2014 16:45:32 +0400
Parents: 6d67dd3103ce8ac0b07981131311f6b29754a518
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e9855b199263c452c0be2d32752c848da54a95fd
Log:
Fixed pass by reference special cases
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 375df48..c18a5a8 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -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) {
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index f842079..8bc6848 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -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) {