com php-src: better guard here and use _ex to avoid eve r reading type info, we know its an object: Zend/zend_object_handlers.c

From: Date: Wed, 06 Apr 2016 07:58:51 +0000
Subject: com php-src: better guard here and use _ex to avoid eve r reading type info, we know its an object: Zend/zend_object_handlers.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-95575@lists.php.net to get a copy of this message
Commit: 46742861d254a5fe74b6d88dde4232e4bae4bb5c Author: Joe Watkins <krakjoe@php.net> Wed, 6 Apr 2016 08:58:51 +0100 Parents: a2d6d5b6f0a4e05866d3777af5668ad386413b68 Branches: typed_ref_properties Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=46742861d254a5fe74b6d88dde4232e4bae4bb5c Log: better guard here and use _ex to avoid ever reading type info, we know its an object Changed paths: M Zend/zend_object_handlers.c Diff: diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 1cb6ffc..c101b4e 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -671,8 +671,8 @@ ZEND_API void zend_std_write_property(zval *object, zval *member, zval *value, v } if ((variable_ptr = zend_hash_find(zobj->properties, Z_STR_P(member))) != NULL) { found: - if (ZEND_CLASS_HAS_TYPE_HINTS(zobj->ce)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(object, member, cache_slot); + 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)))) { @@ -730,8 +730,8 @@ write_std_property: } } - if (ZEND_CLASS_HAS_TYPE_HINTS(zobj->ce)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(object, member, cache_slot); + 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)))) {

« previous php.cvs (#95575) next »