diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-06-24 20:32:27 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-06-24 20:32:27 +0300 |
| commit | 0f29fb5cd81d9df4829bc63f704019df910b3075 (patch) | |
| tree | 05c34dda76c2e45630d5fe9528d10dc5fef97bd3 /Zend/zend_inheritance.c | |
| parent | 94df6dc3fd07fa187ba09c587a8d1357fd8bbe6f (diff) | |
| download | php-git-0f29fb5cd81d9df4829bc63f704019df910b3075.tar.gz | |
Fixed bug 78175 (Preloading must store default values of static variables and properties)
Diffstat (limited to 'Zend/zend_inheritance.c')
| -rw-r--r-- | Zend/zend_inheritance.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index ba1612c189..e62d990c18 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -1178,7 +1178,7 @@ ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent } while (dst != end); } else if (ce->type == ZEND_USER_CLASS) { if (CE_STATIC_MEMBERS(parent_ce) == NULL) { - ZEND_ASSERT(parent_ce->ce_flags & ZEND_ACC_IMMUTABLE); + ZEND_ASSERT(parent_ce->ce_flags & (ZEND_ACC_IMMUTABLE|ZEND_ACC_PRELOADED)); zend_class_init_statics(parent_ce); } src = CE_STATIC_MEMBERS(parent_ce) + parent_ce->default_static_members_count; |