com php-src: safety for non standard objects, remove pointless check: Zend/zend_object_handlers.c Zend/zend_vm_def.h Zend/zend_vm_execute.h

From: Date: Wed, 06 Apr 2016 21:50:22 +0000
Subject: com php-src: safety for non standard objects, remove pointless check: 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-95560@lists.php.net to get a copy of this message
Commit: e62942a2881402a846bd54f7f527b41a36fad154 Author: Joe Watkins <krakjoe@php.net> Wed, 6 Apr 2016 22:50:22 +0100 Parents: 6f57c44d2c61ed553d572eb5c5dc88b4e149b27b Branches: typed_ref_properties Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e62942a2881402a846bd54f7f527b41a36fad154 Log: safety for non standard objects, remove pointless check Changed paths: M Zend/zend_object_handlers.c M Zend/zend_vm_def.h M Zend/zend_vm_execute.h

diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index c101b4e..cc423e7 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -730,17 +730,6 @@ write_std_property: } } - if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(zobj->ce) && Z_TYPE_P(member) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(member), cache_slot); - - if (prop_info) { - 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); - goto exit; - } - } - } - if (EXPECTED(property_offset != ZEND_DYNAMIC_PROPERTY_OFFSET)) { 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 69db951..fe5fa52 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2390,6 +2390,18 @@ ZEND_VM_C_LABEL(fast_assign_obj): ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, (OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 3fdec95..c15b9f0 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -18984,6 +18984,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, (IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -19170,6 +19182,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, (IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -19356,6 +19380,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, (IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -19542,6 +19578,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, (IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -23476,6 +23524,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, (IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -23662,6 +23722,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, (IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -23848,6 +23920,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, (IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -24034,6 +24118,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, (IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -26153,6 +26249,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, ((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -26339,6 +26447,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, ((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -26525,6 +26645,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, ((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -26711,6 +26843,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, ((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -28700,6 +28844,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, (IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -28886,6 +29042,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, (IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -29072,6 +29240,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, (IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -29258,6 +29438,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, (IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -32146,6 +32338,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, (IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -32332,6 +32536,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, (IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -32518,6 +32734,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, (IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -32704,6 +32932,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, (IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -34525,6 +34765,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, ((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -34711,6 +34963,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, ((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -34897,6 +35161,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, ((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -35083,6 +35359,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, ((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -39595,6 +39883,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, (IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -39781,6 +40081,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, (IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -39967,6 +40279,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, (IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -40153,6 +40477,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, (IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -46143,6 +46479,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, (IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -46329,6 +46677,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, (IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -46515,6 +46875,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, (IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -46701,6 +47073,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, (IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -49906,6 +50290,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, ((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -50092,6 +50488,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, ((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -50278,6 +50686,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, ((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { @@ -50464,6 +50884,18 @@ fast_assign_obj: ZVAL_DEREF(value); } + /* safety for non standard zend objects */ + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && Z_OBJ_HT_P(object)->write_property != zend_std_write_property)) { + zend_property_info *prop_info = zend_object_fetch_property_type_info(object, property_name, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); + + if (prop_info) { + if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + HANDLE_EXCEPTION(); + } + } + } + Z_OBJ_HT_P(object)->write_property(object, property_name, value, ((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL); if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) {
« previous php.cvs (#95560) next »