com php-src: Fix further invalid source zval overwrites: Zend/tests/type_declarations/typed_properties_050 .phpt Zend/zend_object_handlers.c
Zend/zend_vm_ def.h Zend/zend_vm_execute.h

From: Date: Tue, 24 May 2016 22:51:14 +0000
Subject: com php-src: Fix further invalid source zval overwrites: Zend/tests/type_declarations/typed_properties_050 .phpt Zend/zend_object_handlers.c
Zend/zend_vm_ def.h Zend/zend_vm_execute.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-95530@lists.php.net to get a copy of this message
Commit: 852606cb664990bf8cc37492151a825bfa2d3afb Author: Bob Weinand <bobwei9@hotmail.com> Wed, 25 May 2016 00:44:29 +0200 Parents: 7d0654eb460a0aac2c5102c6ca035a4aa580eed3 Branches: typed_ref_properties Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=852606cb664990bf8cc37492151a825bfa2d3afb Log: Fix further invalid source zval overwrites Changed paths: A Zend/tests/type_declarations/typed_properties_050.phpt M Zend/zend_object_handlers.c M Zend/zend_vm_def.h M Zend/zend_vm_execute.h

diff --git a/Zend/tests/type_declarations/typed_properties_050.phpt b/Zend/tests/type_declarations/typed_properties_050.phpt new file mode 100644 index 0000000..cc3d135 --- /dev/null +++ b/Zend/tests/type_declarations/typed_properties_050.phpt @@ -0,0 +1,19 @@ +--TEST-- +Weak casts must not overwrite source variables +--FILE-- +<?php + +$b = 1; +$a = "$b"; +class A { public int $a; } +$o = new A; +$o->a = $b; +var_dump($o, $b); + +?> +--EXPECT-- +object(A)#1 (1) { + ["a"]=> + int(1) +} +string(1) "1" diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 3d71e34..609739c 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -747,18 +747,26 @@ ZEND_API void zend_std_write_property(zval *object, zval *member, zval *value, v if (EXPECTED(property_offset != ZEND_DYNAMIC_PROPERTY_OFFSET)) { variable_ptr = OBJ_PROP(zobj, property_offset); if (Z_TYPE_P(variable_ptr) != IS_UNDEF) { - zend_property_info *prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(member), cache_slot);; + zend_property_info *prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(member), cache_slot); zval val; if (UNEXPECTED(prop_info)) { - if (!Z_REFCOUNTED_P(value) || Z_IMMUTABLE_P(value) || Z_REFCOUNT_P(value) > 1) { - ZVAL_COPY_VALUE(&val, value); - value = &val; - } - if (!zend_verify_property_type(prop_info, value, ZEND_CALL_USES_STRICT_TYPES(EG(current_execute_data)))) { - zend_verify_property_type_error(prop_info, Z_STR_P(member), value); + ZVAL_COPY(&val, value); + if (!zend_verify_property_type(prop_info, &val, ZEND_CALL_USES_STRICT_TYPES(EG(current_execute_data)))) { + zend_verify_property_type_error(prop_info, Z_STR_P(member), &val); goto exit; } + if (UNEXPECTED(Z_TYPE(val) != Z_TYPE_P(value))) { + /* little hack to avoid checking prop_info or inlining zend_assign_to_variable multiple times */ + if (UNEXPECTED(Z_REFCOUNTED(tmp_member))) { + zval_ptr_dtor(&tmp_member); + } + + ZVAL_COPY_VALUE(&tmp_member, &val); + value = &val; + } else if (Z_OPT_REFCOUNTED_P(value)) { + Z_DELREF_P(value); + } } found: zend_assign_to_variable(variable_ptr, value, IS_CV); @@ -824,10 +832,8 @@ write_std_property: zend_property_info *prop_info; zval val; if (cache_slot ? UNEXPECTED(prop_info = (zend_property_info *) CACHED_PTR_EX(cache_slot + 2)) : UNEXPECTED(prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(member), NULL))) { - if (!Z_REFCOUNTED_P(value) || Z_IMMUTABLE_P(value) || Z_REFCOUNT_P(value) > 1) { - ZVAL_COPY_VALUE(&val, value); - value = &val; - } + ZVAL_COPY_VALUE(&val, value); + value = &val; if (!zend_verify_property_type(prop_info, value, ZEND_CALL_USES_STRICT_TYPES(EG(current_execute_data)))) { zend_verify_property_type_error(prop_info, Z_STR_P(member), value); zval_ptr_dtor(value); diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index b06aaee..dfc0da1 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2245,15 +2245,28 @@ ZEND_VM_HANDLER(136, ZEND_ASSIGN_OBJ, VAR|UNUSED|THIS|CV, CONST|TMPVAR|CV, SPEC( zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (OP_DATA_TYPE & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (OP_DATA_TYPE & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } FREE_OP_DATA(); FREE_OP2(); FREE_OP1_VAR_PTR(); HANDLE_EXCEPTION(); } + if (OP_DATA_TYPE & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (OP_DATA_TYPE == IS_CONST) { + if (OP_DATA_TYPE == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 144a5fd..6dd5481 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -18486,15 +18486,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CONST_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_CONST & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_CONST & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } + if (IS_CONST & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST) { + if (IS_CONST == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -18674,15 +18687,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CONST_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_TMP_VAR & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_TMP_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } zval_ptr_dtor_nogc(free_op_data); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } + if (IS_TMP_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_TMP_VAR == IS_CONST) { + if (IS_TMP_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -18862,15 +18888,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CONST_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_VAR & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } zval_ptr_dtor_nogc(free_op_data); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } + if (IS_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST) { + if (IS_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -19050,15 +19089,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CONST_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_CV & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_CV & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } + if (IS_CV & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST) { + if (IS_CV == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -23590,15 +23642,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CV_OP_DATA zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_CONST & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_CONST & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } + if (IS_CONST & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST) { + if (IS_CONST == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -23778,15 +23843,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CV_OP_DATA zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_TMP_VAR & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_TMP_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } zval_ptr_dtor_nogc(free_op_data); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } + if (IS_TMP_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_TMP_VAR == IS_CONST) { + if (IS_TMP_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -23966,15 +24044,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CV_OP_DATA zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_VAR & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } zval_ptr_dtor_nogc(free_op_data); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } + if (IS_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST) { + if (IS_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -24154,15 +24245,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CV_OP_DATA zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_CV & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_CV & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } + if (IS_CV & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST) { + if (IS_CV == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -26801,15 +26905,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_TMPVAR_OP_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_CONST & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_CONST & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } zval_ptr_dtor_nogc(free_op2); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } + if (IS_CONST & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST) { + if (IS_CONST == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -26989,15 +27106,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_TMPVAR_OP_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_TMP_VAR & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_TMP_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } zval_ptr_dtor_nogc(free_op_data); zval_ptr_dtor_nogc(free_op2); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } + if (IS_TMP_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_TMP_VAR == IS_CONST) { + if (IS_TMP_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -27177,15 +27307,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_TMPVAR_OP_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_VAR & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } zval_ptr_dtor_nogc(free_op_data); zval_ptr_dtor_nogc(free_op2); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } + if (IS_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST) { + if (IS_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -27365,15 +27508,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_TMPVAR_OP_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_CV & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_CV & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } zval_ptr_dtor_nogc(free_op2); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } + if (IS_CV & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST) { + if (IS_CV == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -29641,15 +29797,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CONST_O zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_CONST & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_CONST & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } HANDLE_EXCEPTION(); } + if (IS_CONST & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST) { + if (IS_CONST == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -29829,15 +29998,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CONST_O zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_TMP_VAR & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_TMP_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } zval_ptr_dtor_nogc(free_op_data); HANDLE_EXCEPTION(); } + if (IS_TMP_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_TMP_VAR == IS_CONST) { + if (IS_TMP_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -30017,15 +30199,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CONST_O zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_VAR & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } zval_ptr_dtor_nogc(free_op_data); HANDLE_EXCEPTION(); } + if (IS_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST) { + if (IS_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -30205,15 +30400,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CONST_O zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_CV & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_CV & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } HANDLE_EXCEPTION(); } + if (IS_CV & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST) { + if (IS_CV == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -33386,15 +33594,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CV_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_CONST & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_CONST & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } HANDLE_EXCEPTION(); } + if (IS_CONST & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST) { + if (IS_CONST == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -33574,15 +33795,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CV_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_TMP_VAR & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_TMP_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } zval_ptr_dtor_nogc(free_op_data); HANDLE_EXCEPTION(); } + if (IS_TMP_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_TMP_VAR == IS_CONST) { + if (IS_TMP_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -33762,15 +33996,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CV_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_VAR & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } zval_ptr_dtor_nogc(free_op_data); HANDLE_EXCEPTION(); } + if (IS_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST) { + if (IS_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -33950,15 +34197,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CV_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_CV & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_CV & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } HANDLE_EXCEPTION(); } + if (IS_CV & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST) { + if (IS_CV == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -36022,15 +36282,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_TMPVAR_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_CONST & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_CONST & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } + if (IS_CONST & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST) { + if (IS_CONST == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -36210,15 +36483,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_TMPVAR_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_TMP_VAR & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_TMP_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } zval_ptr_dtor_nogc(free_op_data); zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } + if (IS_TMP_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_TMP_VAR == IS_CONST) { + if (IS_TMP_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -36398,15 +36684,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_TMPVAR_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_VAR & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } zval_ptr_dtor_nogc(free_op_data); zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } + if (IS_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST) { + if (IS_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -36586,15 +36885,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_TMPVAR_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_CV & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_CV & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } + if (IS_CV & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST) { + if (IS_CV == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -41477,15 +41789,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CONST_OP_DA zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_CONST & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_CONST & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } HANDLE_EXCEPTION(); } + if (IS_CONST & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST) { + if (IS_CONST == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -41665,15 +41990,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CONST_OP_DA zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_TMP_VAR & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_TMP_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } zval_ptr_dtor_nogc(free_op_data); HANDLE_EXCEPTION(); } + if (IS_TMP_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_TMP_VAR == IS_CONST) { + if (IS_TMP_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -41853,15 +42191,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CONST_OP_DA zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_VAR & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } zval_ptr_dtor_nogc(free_op_data); HANDLE_EXCEPTION(); } + if (IS_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST) { + if (IS_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -42041,15 +42392,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CONST_OP_DA zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_CV & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_CV & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } HANDLE_EXCEPTION(); } + if (IS_CV & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST) { + if (IS_CV == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -48628,15 +48992,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CV_OP_DATA_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_CONST & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_CONST & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } HANDLE_EXCEPTION(); } + if (IS_CONST & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST) { + if (IS_CONST == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -48816,15 +49193,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CV_OP_DATA_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_TMP_VAR & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_TMP_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } zval_ptr_dtor_nogc(free_op_data); HANDLE_EXCEPTION(); } + if (IS_TMP_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_TMP_VAR == IS_CONST) { + if (IS_TMP_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -49004,15 +49394,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CV_OP_DATA_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_VAR & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } zval_ptr_dtor_nogc(free_op_data); HANDLE_EXCEPTION(); } + if (IS_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST) { + if (IS_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -49192,15 +49595,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CV_OP_DATA_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_CV & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_CV & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } HANDLE_EXCEPTION(); } + if (IS_CV & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST) { + if (IS_CV == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -52913,15 +53329,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_TMPVAR_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_CONST & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_CONST & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } + if (IS_CONST & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST) { + if (IS_CONST == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -53101,15 +53530,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_TMPVAR_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_TMP_VAR & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_TMP_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } zval_ptr_dtor_nogc(free_op_data); zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } + if (IS_TMP_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_TMP_VAR == IS_CONST) { + if (IS_TMP_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -53289,15 +53731,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_TMPVAR_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_VAR & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } zval_ptr_dtor_nogc(free_op_data); zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } + if (IS_VAR & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST) { + if (IS_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -53477,15 +53932,28 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_TMPVAR_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { + zval val, *orig; + /* avoid overwriting source (does not matter for TMP/VAR) */ + if (IS_CV & (IS_CONST | IS_CV)) { + orig = value; + ZVAL_COPY(&val, value); + value = &val; + } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + if (IS_CV & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } + if (IS_CV & (IS_CONST | IS_CV)) { + zval_ptr_dtor_nogc(&val); + } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST) { + if (IS_CV == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { CACHE_PTR_EX(cache_slot + 2, NULL); } }
« previous php.cvs (#95530) next »