diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-25 16:32:14 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-25 16:32:14 +0200 |
| commit | e63a44dd03aae264561fff77565f4a5f9be035bd (patch) | |
| tree | 1eff71e9122371f78f5129cf833f7c242bc1810d /Zend/zend_inheritance.c | |
| parent | 7d056fc6c0d06ce1f84c5bc0c310f04b43c5de14 (diff) | |
| parent | f1848a4b3f807d21415c5a334b461d240b2a83af (diff) | |
| download | php-git-e63a44dd03aae264561fff77565f4a5f9be035bd.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix bug #78226: Don't call __set() on uninitialized typed properties
Diffstat (limited to 'Zend/zend_inheritance.c')
| -rw-r--r-- | Zend/zend_inheritance.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index 7bd672643d..a1ecb9e2b7 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -1113,7 +1113,7 @@ ZEND_API void zend_do_inheritance_ex(zend_class_entry *ce, zend_class_entry *par do { dst--; src--; - ZVAL_COPY_VALUE(dst, src); + ZVAL_COPY_VALUE_PROP(dst, src); } while (dst != end); pefree(src, ce->type == ZEND_INTERNAL_CLASS); end = ce->default_properties_table; @@ -1128,7 +1128,7 @@ ZEND_API void zend_do_inheritance_ex(zend_class_entry *ce, zend_class_entry *par do { dst--; src--; - ZVAL_COPY_OR_DUP(dst, src); + ZVAL_COPY_OR_DUP_PROP(dst, src); if (Z_OPT_TYPE_P(dst) == IS_CONSTANT_AST) { ce->ce_flags &= ~ZEND_ACC_CONSTANTS_UPDATED; } @@ -1138,7 +1138,7 @@ ZEND_API void zend_do_inheritance_ex(zend_class_entry *ce, zend_class_entry *par do { dst--; src--; - ZVAL_COPY(dst, src); + ZVAL_COPY_PROP(dst, src); if (Z_OPT_TYPE_P(dst) == IS_CONSTANT_AST) { ce->ce_flags &= ~ZEND_ACC_CONSTANTS_UPDATED; } |