com php-src: Merge branch 'PHP-7.4': Zend/zend_API.c Zend /zend_inheritance.c Zend/zend_object_handlers.c Z end/zend_objects.c Zend/zend_types.h
| From: | Nikita Popov | Date: | Fri, 25 Oct 2019 14:32:14 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.4': Zend/zend_API.c Zend /zend_inheritance.c Zend/zend_object_handlers.c Z end/zend_objects.c Zend/zend_types.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-109065@lists.php.net to get a copy of this message | ||
Commit: e63a44dd03aae264561fff77565f4a5f9be035bd
Author: Nikita Popov <nikita.ppv@gmail.com> Fri, 25 Oct 2019 16:32:14 +0200
Parents: 7d056fc6c0d06ce1f84c5bc0c310f04b43c5de14 f1848a4b3f807d21415c5a334b461d240b2a83af
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e63a44dd03aae264561fff77565f4a5f9be035bd
Log:
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix bug #78226: Don't call __set() on uninitialized typed properties
Bugs:
https://bugs.php.net/78226
Changed paths:
MM Zend/zend_API.c
MM Zend/zend_inheritance.c
MM Zend/zend_object_handlers.c
MM Zend/zend_objects.c
MM Zend/zend_types.h
Diff:
diff --cc Zend/zend_object_handlers..c
index c5fd87eb971,5ac64fffb19..492a2d3e1f3
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@@ -1070,8 -1116,10 +1075,10 @@@ ZEND_API void zend_std_unset_property(z
if (zobj->properties) {
HT_FLAGS(zobj->properties) |= HASH_FLAG_HAS_EMPTY_IND;
}
- goto exit;
+ return;
}
+ /* Reset the IS_PROP_UNINIT flag, if it exists. */
+ Z_PROP_FLAG_P(slot) = 0;
} else if (EXPECTED(IS_DYNAMIC_PROPERTY_OFFSET(property_offset))
&& EXPECTED(zobj->properties != NULL)) {
if (UNEXPECTED(GC_REFCOUNT(zobj->properties) > 1)) {