diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-06-27 12:33:20 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-06-27 12:33:20 +0300 |
| commit | 6dc0cd868d972885249ce40f2d64097cd0ba6c1f (patch) | |
| tree | a4ebb76a86ad86bdb1dc8fd2cca1319885858df9 /Zend/zend_inheritance.c | |
| parent | 1231b49271ca0fc933a00d657dcb6a34c388c41a (diff) | |
| download | php-git-6dc0cd868d972885249ce40f2d64097cd0ba6c1f.tar.gz | |
Fixed ZTS race condition (zend_class_entry->ce_flags of internal classes must not be modified, because internal class enties are shared between threads)
Diffstat (limited to 'Zend/zend_inheritance.c')
| -rw-r--r-- | Zend/zend_inheritance.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index 67e2b97d3e..be605a49de 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -925,8 +925,6 @@ ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent ce->default_static_members_count += parent_ce->default_static_members_count; if (ce->type == ZEND_USER_CLASS) { ce->static_members_table = ce->default_static_members_table; - } else { - ce->ce_flags &= ~ZEND_ACC_CONSTANTS_UPDATED; } } |