diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-06-22 12:58:48 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-06-25 15:04:09 +0200 |
| commit | 2543e61aed67add7522e0b4cdf9a13cf3e441f6f (patch) | |
| tree | 35349a532edd97e52927275f2fe474979df614ec /Zend/zend_API.c | |
| parent | 102bcb5c05d91b5138c72df5b118b25c6f9ad383 (diff) | |
| download | php-git-2543e61aed67add7522e0b4cdf9a13cf3e441f6f.tar.gz | |
Fixed bug #76509
In PHP static properties are shared between inheriting classes,
unless they are explicitly overwritten. However, because this
functionality was implemented using reference, it was possible
to break the implementation by reassigning the static property
reference.
This is fixed by switching the implementation from using references
to using INDIRECTs, which cannot be affected by userland code.
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index ab12fed9ad..a4e501217e 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1164,19 +1164,10 @@ ZEND_API int zend_update_class_constants(zend_class_entry *class_type) /* {{{ */ #endif for (i = 0; i < class_type->default_static_members_count; i++) { p = &class_type->default_static_members_table[i]; - if (Z_ISREF_P(p)) { - if (class_type->parent && - i < class_type->parent->default_static_members_count && - p == &class_type->parent->default_static_members_table[i] && - Z_TYPE(CE_STATIC_MEMBERS(class_type->parent)[i]) != IS_UNDEF - ) { - zval *q = &CE_STATIC_MEMBERS(class_type->parent)[i]; - - ZVAL_NEW_REF(q, q); - ZVAL_COPY(&CE_STATIC_MEMBERS(class_type)[i], q); - } else { - ZVAL_COPY_OR_DUP(&CE_STATIC_MEMBERS(class_type)[i], Z_REFVAL_P(p)); - } + if (Z_TYPE_P(p) == IS_INDIRECT) { + zval *q = &CE_STATIC_MEMBERS(class_type->parent)[i]; + ZVAL_DEINDIRECT(q); + ZVAL_INDIRECT(&CE_STATIC_MEMBERS(class_type)[i], q); } else { ZVAL_COPY_OR_DUP(&CE_STATIC_MEMBERS(class_type)[i], p); } |