com php-src: Fixed memory leaks: Zend/tests/type_declarations /typed_properties_046.phpt Zend/zend_object_h andlers.c Zend/zend_vm_def.h
Zend/zend_vm_execu te.h

From: Date: Tue, 24 May 2016 13:43:12 +0000
Subject: com php-src: Fixed memory leaks: Zend/tests/type_declarations /typed_properties_046.phpt Zend/zend_object_h andlers.c Zend/zend_vm_def.h
Zend/zend_vm_execu te.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-95537@lists.php.net to get a copy of this message
Commit: 68bb52e1bed8116c1ac88237bcaf482d4f9a2135 Author: Dmitry Stogov <dmitry@zend.com> Tue, 24 May 2016 16:43:12 +0300 Parents: d27efdb780e81c731592460f0992d3b9ec5cf576 Branches: typed_ref_properties Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=68bb52e1bed8116c1ac88237bcaf482d4f9a2135 Log: Fixed memory leaks Changed paths: A Zend/tests/type_declarations/typed_properties_046.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_046.phpt b/Zend/tests/type_declarations/typed_properties_046.phpt new file mode 100644 index 0000000..8c160a9 --- /dev/null +++ b/Zend/tests/type_declarations/typed_properties_046.phpt @@ -0,0 +1,29 @@ +--TEST-- +Memory leaks on wrong assignment to typed roperty +--FILE-- +<?php +class Foo { + public int $bbb; +} + +function foo() { + return new Foo(); +} + +function bar() { + return str_repeat("b", 3); +} + +for ($i = 0; $i < 5; $i++) { + try { + foo()->{bar()} = str_repeat("a", 3); + } catch (Throwable $e) { + echo $e->getMessage() . "\n"; + } +} +--EXPECT-- +Typed property Foo::$bbb must be integer, string used +Typed property Foo::$bbb must be integer, string used +Typed property Foo::$bbb must be integer, string used +Typed property Foo::$bbb must be integer, string used +Typed property Foo::$bbb must be integer, string used diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index ffe2efe..77b68d0 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -829,6 +829,7 @@ write_std_property: } 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); goto exit; } } diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index c4cda82..537d307 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2245,8 +2245,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + FREE_OP_DATA(); + FREE_OP2(); + FREE_OP1_VAR_PTR(); HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 9d08dca..66cf46c 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -18486,8 +18486,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!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 (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -18671,8 +18674,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + zval_ptr_dtor_nogc(free_op_data); + + if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -18856,8 +18862,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + zval_ptr_dtor_nogc(free_op_data); + + if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -19041,8 +19050,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!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 (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -23578,8 +23590,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!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 (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -23763,8 +23778,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + zval_ptr_dtor_nogc(free_op_data); + + if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -23948,8 +23966,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + zval_ptr_dtor_nogc(free_op_data); + + if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -24133,8 +24154,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!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 (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -26777,8 +26801,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + + zval_ptr_dtor_nogc(free_op2); + if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -26962,8 +26989,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { 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); + if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -27147,8 +27177,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { 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); + if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -27332,8 +27365,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + + zval_ptr_dtor_nogc(free_op2); + if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -29605,8 +29641,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!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(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -29790,8 +29829,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + zval_ptr_dtor_nogc(free_op_data); + + HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -29975,8 +30017,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + zval_ptr_dtor_nogc(free_op_data); + + HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -30160,8 +30205,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!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(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -33338,8 +33386,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!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(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -33523,8 +33574,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + zval_ptr_dtor_nogc(free_op_data); + + HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -33708,8 +33762,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + zval_ptr_dtor_nogc(free_op_data); + + HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -33893,8 +33950,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!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(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -35962,8 +36022,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + + zval_ptr_dtor_nogc(free_op2); + HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -36147,8 +36210,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { 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); + HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -36332,8 +36398,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { 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); + HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -36517,8 +36586,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + + zval_ptr_dtor_nogc(free_op2); + HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -41405,8 +41477,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!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(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -41590,8 +41665,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + zval_ptr_dtor_nogc(free_op_data); + + HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -41775,8 +41853,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + zval_ptr_dtor_nogc(free_op_data); + + HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -41960,8 +42041,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!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(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -48544,8 +48628,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!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(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -48729,8 +48816,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + zval_ptr_dtor_nogc(free_op_data); + + HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -48914,8 +49004,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + zval_ptr_dtor_nogc(free_op_data); + + HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -49099,8 +49192,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!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(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -52817,8 +52913,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + + zval_ptr_dtor_nogc(free_op2); + HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -53002,8 +53101,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { 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); + HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -53187,8 +53289,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { 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); + HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */ @@ -53372,8 +53477,11 @@ 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)) { - if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { + if (UNEXPECTED(!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); + + zval_ptr_dtor_nogc(free_op2); + HANDLE_EXCEPTION(); } /* will remain valid, thus no need to check prop_info in future here */
« previous php.cvs (#95537) next »