com php-src: Merge branch 'master' into typed-properties: Zend/zend_API.h Zend/zend_compile.c Zend/zend_com pile.h Zend/zend_execute.c
Zend/zend_execute_API .c Zend/zend_object_handlers.c Zend/zend_vm_def .h Zend/zend_vm_execute.h

From: Date: Wed, 25 May 2016 07:14:10 +0000
Subject: com php-src: Merge branch 'master' into typed-properties: Zend/zend_API.h Zend/zend_compile.c Zend/zend_com pile.h Zend/zend_execute.c
Zend/zend_execute_API .c 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-95529@lists.php.net to get a copy of this message
Commit: 142e1dad41a7a1539f786fe3c54133ff69668d2b Author: Dmitry Stogov <dmitry@zend.com> Wed, 25 May 2016 10:14:10 +0300 Parents: 852606cb664990bf8cc37492151a825bfa2d3afb 4ba0197f87e3b91be31fe2f072141063ed24074c Branches: typed_ref_properties Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=142e1dad41a7a1539f786fe3c54133ff69668d2b Log: Merge branch 'master' into typed-properties * master: Fix memory leak in imagescale() Update NEWS Better fix for bug #72135 Fixed bug #72213 (Finally leaks on nested exceptions). Forbid dynamic calls to scope introspection functions Allow empty property names Ensure no entry predecessors for SSA construction Replace BB end with BB len Fixed bug #72227: imagescale out-of-bounds read Fix bug #72241: get_icu_value_internal out-of-bounds read Fix bug #72135 - don't create strings with lengths outside int range set versions Add check for string overflow to all string add operations Fix bug #72114 - int/size_t confusion in fread Updated NEWS Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream() Bugs: https://bugs.php..net/72135 https://bugs.php.net/72213 https://bugs.php.net/72227 https://bugs.php.net/72241 https://bugs.php.net/72114 https://bugs.php.net/71331 Changed paths: MM Zend/zend_API.h MM Zend/zend_compile..c MM Zend/zend_compile.h MM Zend/zend_execute.c MM Zend/zend_execute_API.c MM Zend/zend_object_handlers.c MM Zend/zend_vm_def.h MM Zend/zend_vm_execute.h Diff: diff --cc Zend/zend_object_handlers.c index 609739c,d95f5d9..ec3dac0 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@@ -682,25 -669,12 +674,19 @@@ zval *zend_std_read_property(zval *obje retval = &EG(uninitialized_zval); } zval_ptr_dtor(&tmp_object); + + 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))) { + zend_verify_property_type_error(prop_info, Z_STR_P(member), retval); + } + } goto exit; } else { - if (Z_STRVAL_P(member)[0] == '\0') { - if (Z_STRLEN_P(member) == 0) { - zend_throw_error(NULL, "Cannot access empty property"); - retval = &EG(uninitialized_zval); - goto exit; - } else { - zend_throw_error(NULL, "Cannot access property started with '\\0'"); - retval = &EG(uninitialized_zval); - goto exit; - } + if (Z_STRVAL_P(member)[0] == '\0' && Z_STRLEN_P(member) != 0) { + zend_throw_error(NULL, "Cannot access property started with '\\0'"); + retval = &EG(uninitialized_zval); + goto exit; } } }

« previous php.cvs (#95529) next »