com php-src: Fixed ArrayAccess behavior: Zend/zend_execute. c Zend/zend_vm_def.h Zend/zend_vm_execute.h
| From: | Dmitry Stogov | Date: | Thu, 06 Mar 2014 13:59:17 +0000 |
| Subject: | com php-src: Fixed ArrayAccess behavior: Zend/zend_execute. c Zend/zend_vm_def.h Zend/zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77700@lists.php.net to get a copy of this message | ||
Commit: 9ed631a4d085c3293eb72ec73e15ea76ebe18f5e
Author: Dmitry Stogov <dmitry@zend.com> Thu, 6 Mar 2014 17:59:17 +0400
Parents: 3e4c22b4998295b05eebb1ee080585b71b64be75
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9ed631a4d085c3293eb72ec73e15ea76ebe18f5e
Log:
Fixed ArrayAccess behavior
Changed paths:
M Zend/zend_execute.c
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
Diff:
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 7fcc67f..c3f1e31 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -1264,14 +1264,24 @@ convert_to_array:
if (overloaded_result && Z_TYPE_P(overloaded_result) != IS_UNDEF) {
if (!Z_ISREF_P(overloaded_result)) {
-//??? if (Z_REFCOUNT_P(overloaded_result) > 0) {
+ if (Z_REFCOUNTED_P(overloaded_result) && Z_REFCOUNT_P(overloaded_result) > 1) {
+//???
+#if 1
+ Z_DELREF_P(overloaded_result);
+ if (Z_ISREF_P(overloaded_result)) {
+ overloaded_result = Z_REFVAL_P(overloaded_result);
+ }
+ ZVAL_DUP(result, overloaded_result);
+ overloaded_result = result;
+#else
//??? zval *tmp = overloaded_result;
//???
//??? ALLOC_ZVAL(overloaded_result);
//??? ZVAL_DUP(overloaded_result, tmp);
//??? Z_UNSET_ISREF_P(overloaded_result);
//??? Z_SET_REFCOUNT_P(overloaded_result, 0);
-//??? }
+#endif
+ }
if (Z_TYPE_P(overloaded_result) != IS_OBJECT) {
zend_class_entry *ce = Z_OBJCE_P(container);
zend_error(E_NOTICE, "Indirect modification of overloaded element of %s has no
effect", ce->name->val);
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 7b60449..bc2d276 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -1232,7 +1232,7 @@ ZEND_VM_HANDLER(87, ZEND_FETCH_DIM_RW, VAR|CV, CONST|TMP|VAR|UNUSED|CV)
zval *container;
SAVE_OPLINE();
- container = GET_OP1_ZVAL_PTR(BP_VAR_RW);
+ container = GET_OP1_ZVAL_PTR_PTR(BP_VAR_RW);
if (OP1_TYPE == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) {
zend_error_noreturn(E_ERROR, "Cannot use string offset as an array");
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 8d01ddf..c1330da 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -14668,7 +14668,7 @@ static int ZEND_FASTCALL
ZEND_FETCH_DIM_RW_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_H
zval *container;
SAVE_OPLINE();
- container = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
+ container = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
if (IS_VAR == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) {
zend_error_noreturn(E_ERROR, "Cannot use string offset as an array");
@@ -16988,7 +16988,7 @@ static int ZEND_FASTCALL
ZEND_FETCH_DIM_RW_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HAN
zval *container;
SAVE_OPLINE();
- container = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
+ container = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
if (IS_VAR == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) {
zend_error_noreturn(E_ERROR, "Cannot use string offset as an array");
@@ -19205,7 +19205,7 @@ static int ZEND_FASTCALL
ZEND_FETCH_DIM_RW_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HAN
zval *container;
SAVE_OPLINE();
- container = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
+ container = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
if (IS_VAR == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) {
zend_error_noreturn(E_ERROR, "Cannot use string offset as an array");
@@ -21160,7 +21160,7 @@ static int ZEND_FASTCALL
ZEND_FETCH_DIM_RW_SPEC_VAR_UNUSED_HANDLER(ZEND_OPCODE_
zval *container;
SAVE_OPLINE();
- container = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
+ container = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
if (IS_VAR == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) {
zend_error_noreturn(E_ERROR, "Cannot use string offset as an array");
@@ -22619,7 +22619,7 @@ static int ZEND_FASTCALL
ZEND_FETCH_DIM_RW_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HAND
zval *container;
SAVE_OPLINE();
- container = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
+ container = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
if (IS_VAR == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) {
zend_error_noreturn(E_ERROR, "Cannot use string offset as an array");