com php-src: A better to fix for source zval separation on type conversion caused by weak property type check.: Zend/tests/type_declarat
ions/typed_properties_051.phpt Zend/zend_API. c Zend/zend_execute.c Zend/zend_execute.h Zend/ze nd_object_handlers.c Zend/zend_vm_def.h Zend/ze
nd_vm_execute.h ext/standard/var_unserializer.c e xt/standard/var_unserializer.re

From: Date: Wed, 25 May 2016 09:21:28 +0000
Subject: com php-src: A better to fix for source zval separation on type conversion caused by weak property type check.: Zend/tests/type_declarat
ions/typed_properties_051.phpt Zend/zend_API. c Zend/zend_execute.c Zend/zend_execute.h Zend/ze nd_object_handlers.c Zend/zend_vm_def.h Zend/ze
nd_vm_execute.h ext/standard/var_unserializer.c e xt/standard/var_unserializer.re
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-95516@lists.php.net to get a copy of this message
Commit: c992fcf593ac1c216692d3fd6853a95360d9316f Author: Dmitry Stogov <dmitry@zend.com> Wed, 25 May 2016 12:21:28 +0300 Parents: be071cdb6c1d1607ba2380d286fc82e2cdb9295d Branches: typed_ref_properties Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c992fcf593ac1c216692d3fd6853a95360d9316f Log: A better to fix for source zval separation on type conversion caused by weak property type check. Changed paths: A Zend/tests/type_declarations/typed_properties_051.phpt M Zend/zend_API.c M Zend/zend_execute.c M Zend/zend_execute.h M Zend/zend_object_handlers.c M Zend/zend_vm_def.h M Zend/zend_vm_execute.h M ext/standard/var_unserializer.c M ext/standard/var_unserializer.re

diff --git a/Zend/tests/type_declarations/typed_properties_051.phpt b/Zend/tests/type_declarations/typed_properties_051.phpt new file mode 100644 index 0000000..1556eab --- /dev/null +++ b/Zend/tests/type_declarations/typed_properties_051.phpt @@ -0,0 +1,27 @@ +--TEST-- +Weak casts must not leak +--FILE-- +<?php + +class A { + public string $a; +} +class B { + function __toString() { + return str_repeat("ok", 2); + } +} +class C { +} +$o = new A; +$o->a = new B; +var_dump($o->a); +try { + $o->a = new C; +} catch (Throwable $e) { + echo $e->getMessage()."\n"; +} +?> +--EXPECT-- +string(4) "okok" +Typed property A::$a must be string, C used diff --git a/Zend/zend_API.c b/Zend/zend_API.c index d992b95..885b0ff 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1195,13 +1195,17 @@ ZEND_API void object_properties_init_ex(zend_object *object, HashTable *properti zval *slot = OBJ_PROP(object, property_info->offset); if (UNEXPECTED(property_info->type)) { - if (UNEXPECTED(!zend_verify_property_type(property_info, prop, 0))) { + zval tmp, *val; + + val = zend_verify_property_type(property_info, prop, &tmp, 0); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(property_info, key, prop); continue; } + ZVAL_COPY_VALUE(slot, val); + } else { + ZVAL_COPY_VALUE(slot, prop); } - - ZVAL_COPY_VALUE(slot, prop); ZVAL_INDIRECT(prop, slot); } } ZEND_HASH_FOREACH_END(); diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 6fc3b5f..7590e86 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -705,7 +705,7 @@ static int is_null_constant(zend_class_entry *scope, zval *default_value) return 0; } -static zend_bool zend_verify_weak_scalar_type_hint(zend_uchar type_hint, zval *arg) +static zend_bool zend_verify_weak_scalar_type_hint(zend_uchar type_hint, zval *arg, zval *ret) { switch (type_hint) { case _IS_BOOL: { @@ -715,7 +715,7 @@ static zend_bool zend_verify_weak_scalar_type_hint(zend_uchar type_hint, zval *a return 0; } zval_ptr_dtor(arg); - ZVAL_BOOL(arg, dest); + ZVAL_BOOL(ret, dest); return 1; } case IS_LONG: { @@ -725,7 +725,7 @@ static zend_bool zend_verify_weak_scalar_type_hint(zend_uchar type_hint, zval *a return 0; } zval_ptr_dtor(arg); - ZVAL_LONG(arg, dest); + ZVAL_LONG(ret, dest); return 1; } case IS_DOUBLE: { @@ -735,14 +735,24 @@ static zend_bool zend_verify_weak_scalar_type_hint(zend_uchar type_hint, zval *a return 0; } zval_ptr_dtor(arg); - ZVAL_DOUBLE(arg, dest); + ZVAL_DOUBLE(ret, dest); return 1; } case IS_STRING: { zend_string *dest; + if (arg != ret) { + ZVAL_COPY(ret, arg); + /* on success "arg" is converted to IS_STRING */ + if (!zend_parse_arg_str_weak(ret, &dest)) { + zval_ptr_dtor(ret); + return 0; + } + zval_ptr_dtor(arg); + return 1; + } /* on success "arg" is converted to IS_STRING */ - if (!zend_parse_arg_str_weak(arg, &dest)) { + if (!zend_parse_arg_str_weak(ret, &dest)) { return 0; } return 1; @@ -752,7 +762,7 @@ static zend_bool zend_verify_weak_scalar_type_hint(zend_uchar type_hint, zval *a } } -static zend_bool zend_verify_scalar_type_hint(zend_uchar type_hint, zval *arg, zend_bool strict) +static zend_bool zend_verify_scalar_type_hint(zend_uchar type_hint, zval *arg, zval *ret, zend_bool strict) { if (UNEXPECTED(strict)) { /* SSTH Exception: IS_LONG may be accepted as IS_DOUBLE (converted) */ @@ -763,7 +773,7 @@ static zend_bool zend_verify_scalar_type_hint(zend_uchar type_hint, zval *arg, z /* NULL may be accepted only by nullable hints (this is already checked) */ return 0; } - return zend_verify_weak_scalar_type_hint(type_hint, arg); + return zend_verify_weak_scalar_type_hint(type_hint, arg, ret); } static int zend_verify_internal_arg_type(zend_function *zf, uint32_t arg_num, zval *arg) @@ -803,7 +813,7 @@ static int zend_verify_internal_arg_type(zend_function *zf, uint32_t arg_num, zv } else if (cur_arg_info->type_hint == _IS_BOOL && EXPECTED(Z_TYPE_P(arg) == IS_FALSE || Z_TYPE_P(arg) == IS_TRUE)) { /* pass */ - } else if (UNEXPECTED(!zend_verify_scalar_type_hint(cur_arg_info->type_hint, arg, ZEND_CALL_USES_STRICT_TYPES(EG(current_execute_data))))) { + } else if (UNEXPECTED(!zend_verify_scalar_type_hint(cur_arg_info->type_hint, arg, arg, ZEND_CALL_USES_STRICT_TYPES(EG(current_execute_data))))) { zend_verify_arg_error(zf, arg_num, "be of the type ", zend_get_type_by_const(cur_arg_info->type_hint), zend_zval_type_name(arg), ""); return 0; } @@ -842,7 +852,7 @@ ZEND_COLD zend_never_inline void zend_verify_property_type_error(zend_property_i } } -static zend_always_inline zend_bool i_zend_verify_property_type(zend_property_info *info, zval *property, zend_bool strict) +static zend_always_inline zval* i_zend_verify_property_type(zend_property_info *info, zval *property, zval *tmp, zend_bool strict) { if (EXPECTED(info->type == Z_TYPE_P(property))) { if (info->type_name) { @@ -851,34 +861,37 @@ static zend_always_inline zend_bool i_zend_verify_property_type(zend_property_in if (!info->type_ce) { info->type_ce = zend_lookup_class(resolved); if (!info->type_ce) { - return 0; + return NULL; } } if (!instanceof_function(Z_OBJCE_P(property), info->type_ce)) { - return 0; + return NULL; } } - return 1; + return property; } else if (info->allow_null && Z_TYPE_P(property) == IS_NULL) { - return 1; + return property; } else if (EXPECTED(info->type == IS_CALLABLE)) { if (Z_TYPE_P(property) == IS_OBJECT) { - return instanceof_function(zend_ce_closure, Z_OBJCE_P(property)); + return instanceof_function(zend_ce_closure, Z_OBJCE_P(property)) ? + property : NULL; } else { - return zend_is_callable(property, IS_CALLABLE_CHECK_SILENT, NULL); + return zend_is_callable(property, IS_CALLABLE_CHECK_SILENT, NULL) ? + property : NULL; } } else if (info->type == _IS_BOOL && EXPECTED(Z_TYPE_P(property) == IS_FALSE || Z_TYPE_P(property) == IS_TRUE)) { - return 1; + return property; } else { - return zend_verify_scalar_type_hint(info->type, property, strict); + return zend_verify_scalar_type_hint(info->type, property, tmp, strict) ? + tmp : NULL; } } -zend_bool zend_verify_property_type(zend_property_info *info, zval *property, zend_bool strict) +zval* zend_verify_property_type(zend_property_info *info, zval *property, zval *tmp, zend_bool strict) { - return i_zend_verify_property_type(info, property, strict); + return i_zend_verify_property_type(info, property, tmp, strict); } static zend_never_inline int zend_verify_internal_arg_types(zend_function *fbc, zend_execute_data *call) @@ -963,7 +976,7 @@ static zend_always_inline int zend_verify_arg_type(zend_function *zf, uint32_t a } else if (cur_arg_info->type_hint == _IS_BOOL && EXPECTED(Z_TYPE_P(arg) == IS_FALSE || Z_TYPE_P(arg) == IS_TRUE)) { /* pass */ - } else if (UNEXPECTED(!zend_verify_scalar_type_hint(cur_arg_info->type_hint, arg, ZEND_ARG_USES_STRICT_TYPES()))) { + } else if (UNEXPECTED(!zend_verify_scalar_type_hint(cur_arg_info->type_hint, arg, arg, ZEND_ARG_USES_STRICT_TYPES()))) { zend_verify_arg_error(zf, arg_num, "be of the type ", zend_get_type_by_const(cur_arg_info->type_hint), zend_zval_type_name(arg), ""); return 0; } @@ -1180,7 +1193,7 @@ static zend_always_inline void zend_verify_return_type(zend_function *zf, zval * * that bans `return ...;` within a void function. Thus we can skip * this part of the runtime check for non-internal functions. */ - } else if (UNEXPECTED(!zend_verify_scalar_type_hint(ret_info->type_hint, ret, ZEND_RET_USES_STRICT_TYPES()))) { + } else if (UNEXPECTED(!zend_verify_scalar_type_hint(ret_info->type_hint, ret, ret, ZEND_RET_USES_STRICT_TYPES()))) { zend_verify_return_error(zf, "be of the type ", zend_get_type_by_const(ret_info->type_hint), zend_zval_type_name(ret), ""); } } diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h index ffd3c93..50a1645 100644 --- a/Zend/zend_execute.h +++ b/Zend/zend_execute.h @@ -420,7 +420,7 @@ static zend_always_inline zend_property_info* zend_object_fetch_property_type_in return zend_object_fetch_property_type_info_ex(object, Z_STR_P(property), cache_slot); } -zend_bool zend_verify_property_type(zend_property_info *info, zval *property, zend_bool strict); +zval* zend_verify_property_type(zend_property_info *info, zval *property, zval *tmp, zend_bool strict); ZEND_COLD void zend_verify_property_type_error(zend_property_info *info, zend_string *name, zval *property); END_EXTERN_C() diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 2b4aa94..5daaeae 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -677,7 +677,10 @@ zval *zend_std_read_property(zval *object, zval *member, int type, void **cache_ if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(zobj->ce) && (prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(member), cache_slot)))) { - if (!UNEXPECTED(zend_verify_property_type(prop_info, retval, (zobj->ce->__get->common.fn_flags & ZEND_ACC_STRICT_TYPES) != 0))) { + zval tmp, *val; + + val = zend_verify_property_type(prop_info, retval, &tmp, (zobj->ce->__get->common.fn_flags & ZEND_ACC_STRICT_TYPES) != 0); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(member), retval); } } @@ -734,12 +737,15 @@ ZEND_API void zend_std_write_property(zval *object, zval *member, zval *value, v 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); + zval tmp, *val; if (UNEXPECTED(prop_info)) { - if (!zend_verify_property_type(prop_info, value, ZEND_CALL_USES_STRICT_TYPES(EG(current_execute_data)))) { + val = zend_verify_property_type(prop_info, value, &tmp, ZEND_CALL_USES_STRICT_TYPES(EG(current_execute_data))); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(member), value); goto exit; } + value = val; } found: zend_assign_to_variable(variable_ptr, value, IS_CV); @@ -797,13 +803,16 @@ write_std_property: } if (EXPECTED(property_offset != ZEND_DYNAMIC_PROPERTY_OFFSET)) { zend_property_info *prop_info; + zval tmp, *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 (!zend_verify_property_type(prop_info, value, ZEND_CALL_USES_STRICT_TYPES(EG(current_execute_data)))) { + val = zend_verify_property_type(prop_info, value, &tmp, ZEND_CALL_USES_STRICT_TYPES(EG(current_execute_data))); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(member), value); zval_ptr_dtor(value); goto exit; } + value = val; } ZVAL_COPY_VALUE(OBJ_PROP(zobj, property_offset), value); } else { diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 66f546d..0182b5b 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2243,9 +2243,11 @@ ZEND_VM_HANDLER(136, ZEND_ASSIGN_OBJ, VAR|UNUSED|THIS|CV, CONST|TMPVAR|CV, SPEC( property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); FREE_OP_DATA(); FREE_OP2(); @@ -2253,9 +2255,10 @@ ZEND_VM_HANDLER(136, ZEND_ASSIGN_OBJ, VAR|UNUSED|THIS|CV, CONST|TMPVAR|CV, SPEC( HANDLE_EXCEPTION(); } /* 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 && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } ZEND_VM_C_LABEL(fast_assign_obj): diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index efc5504..fc41a0d 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -18461,9 +18461,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CONST_OP_D property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); @@ -18471,9 +18473,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CONST_OP_D HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST) { + if (IS_CONST == IS_CONST && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -18649,9 +18652,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CONST_OP_D property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); zval_ptr_dtor_nogc(free_op_data); @@ -18659,9 +18664,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CONST_OP_D HANDLE_EXCEPTION(); } /* 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 && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -18837,9 +18843,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CONST_OP_D property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); zval_ptr_dtor_nogc(free_op_data); @@ -18847,9 +18855,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CONST_OP_D HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST) { + if (IS_VAR == IS_CONST && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -19025,9 +19034,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CONST_OP_D property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); @@ -19035,9 +19046,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CONST_OP_D HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST) { + if (IS_CV == IS_CONST && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -23565,9 +23577,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CV_OP_DATA property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); @@ -23575,9 +23589,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CV_OP_DATA HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST) { + if (IS_CONST == IS_CONST && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -23753,9 +23768,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CV_OP_DATA property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); zval_ptr_dtor_nogc(free_op_data); @@ -23763,9 +23780,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CV_OP_DATA HANDLE_EXCEPTION(); } /* 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 && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -23941,9 +23959,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CV_OP_DATA property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); zval_ptr_dtor_nogc(free_op_data); @@ -23951,9 +23971,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CV_OP_DATA HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST) { + if (IS_VAR == IS_CONST && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -24129,9 +24150,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CV_OP_DATA property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); @@ -24139,9 +24162,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CV_OP_DATA HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST) { + if (IS_CV == IS_CONST && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -26776,9 +26800,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_TMPVAR_OP_ property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); zval_ptr_dtor_nogc(free_op2); @@ -26786,9 +26812,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_TMPVAR_OP_ HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST) { + if (IS_CONST == IS_CONST && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -26964,9 +26991,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_TMPVAR_OP_ property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); zval_ptr_dtor_nogc(free_op_data); zval_ptr_dtor_nogc(free_op2); @@ -26974,9 +27003,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_TMPVAR_OP_ HANDLE_EXCEPTION(); } /* 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 && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -27152,9 +27182,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_TMPVAR_OP_ property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); zval_ptr_dtor_nogc(free_op_data); zval_ptr_dtor_nogc(free_op2); @@ -27162,9 +27194,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_TMPVAR_OP_ HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST) { + if (IS_VAR == IS_CONST && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -27340,9 +27373,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_TMPVAR_OP_ property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); zval_ptr_dtor_nogc(free_op2); @@ -27350,9 +27385,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_TMPVAR_OP_ HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST) { + if (IS_CV == IS_CONST && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -29616,9 +29652,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CONST_O property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); @@ -29626,9 +29664,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CONST_O HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST) { + if (IS_CONST == IS_CONST && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -29804,9 +29843,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CONST_O property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); zval_ptr_dtor_nogc(free_op_data); @@ -29814,9 +29855,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CONST_O HANDLE_EXCEPTION(); } /* 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 && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -29992,9 +30034,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CONST_O property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); zval_ptr_dtor_nogc(free_op_data); @@ -30002,9 +30046,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CONST_O HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST) { + if (IS_VAR == IS_CONST && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -30180,9 +30225,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CONST_O property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); @@ -30190,9 +30237,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CONST_O HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST) { + if (IS_CV == IS_CONST && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -33361,9 +33409,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CV_OP_D property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); @@ -33371,9 +33421,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CV_OP_D HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST) { + if (IS_CONST == IS_CONST && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -33549,9 +33600,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CV_OP_D property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); zval_ptr_dtor_nogc(free_op_data); @@ -33559,9 +33612,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CV_OP_D HANDLE_EXCEPTION(); } /* 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 && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -33737,9 +33791,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CV_OP_D property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); zval_ptr_dtor_nogc(free_op_data); @@ -33747,9 +33803,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CV_OP_D HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST) { + if (IS_VAR == IS_CONST && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -33925,9 +33982,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CV_OP_D property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); @@ -33935,9 +33994,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CV_OP_D HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST) { + if (IS_CV == IS_CONST && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -35997,9 +36057,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_TMPVAR_ property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); zval_ptr_dtor_nogc(free_op2); @@ -36007,9 +36069,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_TMPVAR_ HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST) { + if (IS_CONST == IS_CONST && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -36185,9 +36248,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_TMPVAR_ property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); zval_ptr_dtor_nogc(free_op_data); zval_ptr_dtor_nogc(free_op2); @@ -36195,9 +36260,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_TMPVAR_ HANDLE_EXCEPTION(); } /* 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 && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -36373,9 +36439,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_TMPVAR_ property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); zval_ptr_dtor_nogc(free_op_data); zval_ptr_dtor_nogc(free_op2); @@ -36383,9 +36451,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_TMPVAR_ HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST) { + if (IS_VAR == IS_CONST && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -36561,9 +36630,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_TMPVAR_ property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); zval_ptr_dtor_nogc(free_op2); @@ -36571,9 +36642,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_TMPVAR_ HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST) { + if (IS_CV == IS_CONST && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -41452,9 +41524,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CONST_OP_DA property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); @@ -41462,9 +41536,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CONST_OP_DA HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST) { + if (IS_CONST == IS_CONST && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -41640,9 +41715,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CONST_OP_DA property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); zval_ptr_dtor_nogc(free_op_data); @@ -41650,9 +41727,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CONST_OP_DA HANDLE_EXCEPTION(); } /* 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 && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -41828,9 +41906,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CONST_OP_DA property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); zval_ptr_dtor_nogc(free_op_data); @@ -41838,9 +41918,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CONST_OP_DA HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST) { + if (IS_VAR == IS_CONST && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -42016,9 +42097,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CONST_OP_DA property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); @@ -42026,9 +42109,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CONST_OP_DA HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST) { + if (IS_CV == IS_CONST && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -48603,9 +48687,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CV_OP_DATA_ property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); @@ -48613,9 +48699,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CV_OP_DATA_ HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST) { + if (IS_CONST == IS_CONST && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -48791,9 +48878,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CV_OP_DATA_ property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); zval_ptr_dtor_nogc(free_op_data); @@ -48801,9 +48890,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CV_OP_DATA_ HANDLE_EXCEPTION(); } /* 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 && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -48979,9 +49069,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CV_OP_DATA_ property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); zval_ptr_dtor_nogc(free_op_data); @@ -48989,9 +49081,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CV_OP_DATA_ HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST) { + if (IS_VAR == IS_CONST && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -49167,9 +49260,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CV_OP_DATA_ property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); @@ -49177,9 +49272,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CV_OP_DATA_ HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST) { + if (IS_CV == IS_CONST && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -52888,9 +52984,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_TMPVAR_OP_D property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); zval_ptr_dtor_nogc(free_op2); @@ -52898,9 +52996,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_TMPVAR_OP_D HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST) { + if (IS_CONST == IS_CONST && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -53076,9 +53175,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_TMPVAR_OP_D property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); zval_ptr_dtor_nogc(free_op_data); zval_ptr_dtor_nogc(free_op2); @@ -53086,9 +53187,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_TMPVAR_OP_D HANDLE_EXCEPTION(); } /* 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 && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -53264,9 +53366,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_TMPVAR_OP_D property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); zval_ptr_dtor_nogc(free_op_data); zval_ptr_dtor_nogc(free_op2); @@ -53274,9 +53378,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_TMPVAR_OP_D HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST) { + if (IS_VAR == IS_CONST && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: @@ -53452,9 +53557,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_TMPVAR_OP_D property = OBJ_PROP(zobj, prop_offset); if (Z_TYPE_P(property) != IS_UNDEF) { zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); + zval tmp, *val; if (UNEXPECTED(prop_info != NULL)) { - if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { + val = i_zend_verify_property_type(prop_info, value, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); zval_ptr_dtor_nogc(free_op2); @@ -53462,9 +53569,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_TMPVAR_OP_D HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST) { + if (IS_CV == IS_CONST && val == value) { CACHE_PTR_EX(cache_slot + 2, NULL); } + value = val; } fast_assign_obj: diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c index a776e8a..7879d97 100644 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.14.3 */ +/* Generated by re2c 0.13.5 */ #line 1 "ext/standard/var_unserializer.re" /* +----------------------------------------------------------------------+ @@ -304,7 +304,7 @@ static inline size_t parse_uiv(const unsigned char *p) static zend_always_inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, zend_long elements, zend_class_entry *ce) { while (elements-- > 0) { - zval key, *data, d, *old_data; + zval key, *data, d, *old_data, tmp; zend_ulong idx; zend_property_info *info = NULL; @@ -399,7 +399,8 @@ string_key: } if (UNEXPECTED(info)) { - if (UNEXPECTED(!zend_verify_property_type(info, data, 1))) { + data = zend_verify_property_type(info, data, &tmp, 1); + if (UNEXPECTED(!data)) { zval_dtor(&key); return 0; } @@ -550,7 +551,7 @@ PHPAPI int php_var_unserialize_ex(UNSERIALIZE_PARAMETER) start = cursor; -#line 554 "ext/standard/var_unserializer.c" +#line 555 "ext/standard/var_unserializer.c" { YYCTYPE yych; static const unsigned char yybm[] = { @@ -610,9 +611,9 @@ yy2: yych = *(YYMARKER = ++YYCURSOR); if (yych == ':') goto yy95; yy3: -#line 920 "ext/standard/var_unserializer.re" +#line 921 "ext/standard/var_unserializer.re" { return 0; } -#line 616 "ext/standard/var_unserializer.c" +#line 617 "ext/standard/var_unserializer.c" yy4: yych = *(YYMARKER = ++YYCURSOR); if (yych == ':') goto yy89; @@ -655,13 +656,13 @@ yy13: goto yy3; yy14: ++YYCURSOR; -#line 914 "ext/standard/var_unserializer.re" +#line 915 "ext/standard/var_unserializer.re" { /* this is the case where we have less data than planned */ php_error_docref(NULL, E_NOTICE, "Unexpected end of serialized data"); return 0; /* not sure if it should be 0 or 1 here? */ } -#line 665 "ext/standard/var_unserializer.c" +#line 666 "ext/standard/var_unserializer.c" yy16: yych = *++YYCURSOR; goto yy3; @@ -687,12 +688,11 @@ yy20: if (yybm[0+yych] & 128) { goto yy20; } - if (yych <= '/') goto yy18; - if (yych >= ';') goto yy18; + if (yych != ':') goto yy18; yych = *++YYCURSOR; if (yych != '"') goto yy18; ++YYCURSOR; -#line 769 "ext/standard/var_unserializer.re" +#line 770 "ext/standard/var_unserializer.re" { size_t len, len2, len3, maxlen; zend_long elements; @@ -862,7 +862,7 @@ yy27: yych = *++YYCURSOR; if (yych != '"') goto yy18; ++YYCURSOR; -#line 762 "ext/standard/var_unserializer.re" +#line 763 "ext/standard/var_unserializer.re" { if (!var_hash) return 0; @@ -890,7 +890,7 @@ yy34: yych = *++YYCURSOR; if (yych != '{') goto yy18; ++YYCURSOR; -#line 738 "ext/standard/var_unserializer.re" +#line 739 "ext/standard/var_unserializer.re" { zend_long elements = parse_iv(start + 2); /* use iv() not uiv() in order to check data range */ @@ -935,7 +935,7 @@ yy41: yych = *++YYCURSOR; if (yych != '"') goto yy18; ++YYCURSOR; -#line 704 "ext/standard/var_unserializer.re" +#line 705 "ext/standard/var_unserializer.re" { size_t len, maxlen; zend_string *str; @@ -990,7 +990,7 @@ yy48: yych = *++YYCURSOR; if (yych != '"') goto yy18; ++YYCURSOR; -#line 672 "ext/standard/var_unserializer.re" +#line 673 "ext/standard/var_unserializer.re" { size_t len, maxlen; char *str; @@ -1110,7 +1110,7 @@ yy61: } yy63: ++YYCURSOR; -#line 663 "ext/standard/var_unserializer.re" +#line 664 "ext/standard/var_unserializer.re" { #if SIZEOF_ZEND_LONG == 4 use_double: @@ -1178,7 +1178,7 @@ yy73: yych = *++YYCURSOR; if (yych != ';') goto yy18; ++YYCURSOR; -#line 647 "ext/standard/var_unserializer.re" +#line 648 "ext/standard/var_unserializer.re" { *p = YYCURSOR; @@ -1221,7 +1221,7 @@ yy79: if (yych <= '9') goto yy79; if (yych != ';') goto yy18; ++YYCURSOR; -#line 621 "ext/standard/var_unserializer.re" +#line 622 "ext/standard/var_unserializer.re" { #if SIZEOF_ZEND_LONG == 4 int digits = YYCURSOR - start - 3; @@ -1255,7 +1255,7 @@ yy83: yych = *++YYCURSOR; if (yych != ';') goto yy18; ++YYCURSOR; -#line 615 "ext/standard/var_unserializer.re" +#line 616 "ext/standard/var_unserializer.re" { *p = YYCURSOR; ZVAL_BOOL(rval, parse_iv(start + 2)); @@ -1264,7 +1264,7 @@ yy83: #line 1265 "ext/standard/var_unserializer.c" yy87: ++YYCURSOR; -#line 609 "ext/standard/var_unserializer.re" +#line 610 "ext/standard/var_unserializer.re" { *p = YYCURSOR; ZVAL_NULL(rval); @@ -1293,7 +1293,7 @@ yy91: if (yych <= '9') goto yy91; if (yych != ';') goto yy18; ++YYCURSOR; -#line 584 "ext/standard/var_unserializer.re" +#line 585 "ext/standard/var_unserializer.re" { zend_long id; @@ -1341,7 +1341,7 @@ yy97: if (yych <= '9') goto yy97; if (yych != ';') goto yy18; ++YYCURSOR; -#line 558 "ext/standard/var_unserializer.re" +#line 559 "ext/standard/var_unserializer.re" { zend_long id; @@ -1369,7 +1369,7 @@ yy97: } #line 1371 "ext/standard/var_unserializer.c" } -#line 922 "ext/standard/var_unserializer.re" +#line 923 "ext/standard/var_unserializer.re" return 0; diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re index bfc8a35..8cd6b40 100644 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@ -308,7 +308,7 @@ static inline size_t parse_uiv(const unsigned char *p) static zend_always_inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, zend_long elements, zend_class_entry *ce) { while (elements-- > 0) { - zval key, *data, d, *old_data; + zval key, *data, d, *old_data, tmp; zend_ulong idx; zend_property_info *info = NULL; @@ -403,7 +403,8 @@ string_key: } if (UNEXPECTED(info)) { - if (UNEXPECTED(!zend_verify_property_type(info, data, 1))) { + data = zend_verify_property_type(info, data, &tmp, 1); + if (UNEXPECTED(!data)) { zval_dtor(&key); return 0; }
« previous php.cvs (#95516) next »