Typo

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index b67d5b0a6487d796715e2c1b96a4a24896cda6bc..8954e69cc10707b8e664f9669cf6671ddaccea96 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -409,7 +409,6 @@ ZEND_VM_HELPER_EX(zend_binary_assign_op_obj_helper, VAR|UNUSED|CV, CONST|TMP|VAR
                                } else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
                                        Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
                                }
-                               zval_ptr_dtor(&object);
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(z);
                                        EX_T(opline->result.var).var.ptr = z;
@@ -424,6 +423,7 @@ ZEND_VM_HELPER_EX(zend_binary_assign_op_obj_helper, VAR|UNUSED|CV, CONST|TMP|VAR
                                        EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
 
                if (IS_OP2_TMP_FREE()) {

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 859a0785413f1036a1f223aca009b69fd0f55a55..c0b64b61a31af843c62438ca168a48cc1d3421d5 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -14185,7 +14185,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_VAR_CONST(int (*b
                                } else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
                                        Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
                                }
-                               zval_ptr_dtor(&object);
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(z);
                                        EX_T(opline->result.var).var.ptr = z;
@@ -14200,6 +14199,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_VAR_CONST(int (*b
                                        EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
 
                if (0) {
@@ -16702,7 +16702,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_VAR_TMP(int (*bin
                                } else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
                                        Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
                                }
-                               zval_ptr_dtor(&object);
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(z);
                                        EX_T(opline->result.var).var.ptr = z;
@@ -16717,6 +16716,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_VAR_TMP(int (*bin
                                        EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
 
                if (1) {
@@ -18799,7 +18799,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_VAR_VAR(int (*bin
                                } else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
                                        Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
                                }
-                               zval_ptr_dtor(&object);
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(z);
                                        EX_T(opline->result.var).var.ptr = z;
@@ -18814,6 +18813,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_VAR_VAR(int (*bin
                                        EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
 
                if (0) {
@@ -21003,7 +21003,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_VAR_UNUSED(int (*
                                } else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
                                        Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
                                }
-                               zval_ptr_dtor(&object);
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(z);
                                        EX_T(opline->result.var).var.ptr = z;
@@ -21018,6 +21017,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_VAR_UNUSED(int (*
                                        EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
 
                if (0) {
@@ -22437,7 +22437,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_VAR_CV(int (*bina
                                } else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
                                        Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
                                }
-                               zval_ptr_dtor(&object);
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(z);
                                        EX_T(opline->result.var).var.ptr = z;
@@ -22452,6 +22451,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_VAR_CV(int (*bina
                                        EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
 
                if (0) {
@@ -24395,7 +24395,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_CONST(int
                                } else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
                                        Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
                                }
-                               zval_ptr_dtor(&object);
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(z);
                                        EX_T(opline->result.var).var.ptr = z;
@@ -24410,6 +24409,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_CONST(int
                                        EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
 
                if (0) {
@@ -25817,7 +25817,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_TMP(int (*
                                } else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
                                        Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
                                }
-                               zval_ptr_dtor(&object);
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(z);
                                        EX_T(opline->result.var).var.ptr = z;
@@ -25832,6 +25831,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_TMP(int (*
                                        EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
 
                if (1) {
@@ -27143,7 +27143,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_VAR(int (*
                                } else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
                                        Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
                                }
-                               zval_ptr_dtor(&object);
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(z);
                                        EX_T(opline->result.var).var.ptr = z;
@@ -27158,6 +27157,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_VAR(int (*
                                        EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
 
                if (0) {
@@ -28470,7 +28470,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_UNUSED(int
                                } else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
                                        Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
                                }
-                               zval_ptr_dtor(&object);
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(z);
                                        EX_T(opline->result.var).var.ptr = z;
@@ -28485,6 +28484,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_UNUSED(int
                                        EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
 
                if (0) {
@@ -28898,7 +28898,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_CV(int (*b
                                } else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
                                        Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
                                }
-                               zval_ptr_dtor(&object);
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(z);
                                        EX_T(opline->result.var).var.ptr = z;
@@ -28913,6 +28912,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_CV(int (*b
                                        EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
 
                if (0) {
@@ -31712,7 +31712,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_CV_CONST(int (*bi
                                } else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
                                        Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
                                }
-                               zval_ptr_dtor(&object);
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(z);
                                        EX_T(opline->result.var).var.ptr = z;
@@ -31727,6 +31726,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_CV_CONST(int (*bi
                                        EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
 
                if (0) {
@@ -33994,7 +33994,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_CV_TMP(int (*bina
                                } else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
                                        Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
                                }
-                               zval_ptr_dtor(&object);
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(z);
                                        EX_T(opline->result.var).var.ptr = z;
@@ -34009,6 +34008,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_CV_TMP(int (*bina
                                        EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
 
                if (1) {
@@ -35953,7 +35953,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_CV_VAR(int (*bina
                                } else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
                                        Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
                                }
-                               zval_ptr_dtor(&object);
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(z);
                                        EX_T(opline->result.var).var.ptr = z;
@@ -35968,6 +35967,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_CV_VAR(int (*bina
                                        EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
 
                if (0) {
@@ -38018,7 +38018,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_CV_UNUSED(int (*b
                                } else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
                                        Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
                                }
-                               zval_ptr_dtor(&object);
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(z);
                                        EX_T(opline->result.var).var.ptr = z;
@@ -38033,6 +38032,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_CV_UNUSED(int (*b
                                        EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
 
                if (0) {
@@ -39304,7 +39304,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_CV_CV(int (*binar
                                } else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
                                        Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
                                }
-                               zval_ptr_dtor(&object);
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(z);
                                        EX_T(opline->result.var).var.ptr = z;
@@ -39319,6 +39318,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_CV_CV(int (*binar
                                        EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
 
                if (0) {