diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-11-25 14:09:18 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-11-25 14:09:18 +0300 |
| commit | 2ebf530946354e39e3d3df8f96813a06f495f930 (patch) | |
| tree | 536b765c14ca5387fb9abcb57fd32ec42b9f29d5 /Zend/zend_API.c | |
| parent | 71d42dc7949e50fc7a4127ec24c7c0d4f3c40e25 (diff) | |
| parent | bb30fe9e2b86a46a167c88daaae0c650cb01afa2 (diff) | |
| download | php-git-2ebf530946354e39e3d3df8f96813a06f495f930.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #78868 (Calling __autoload() with incorrect EG(fake_scope) value)
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 6d9d10a13f..e7566194fc 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -4206,6 +4206,12 @@ ZEND_API int zend_update_static_property_ex(zend_class_entry *scope, zend_string zend_property_info *prop_info; zend_class_entry *old_scope = EG(fake_scope); + if (UNEXPECTED(!(scope->ce_flags & ZEND_ACC_CONSTANTS_UPDATED))) { + if (UNEXPECTED(zend_update_class_constants(scope)) != SUCCESS) { + return FAILURE; + } + } + EG(fake_scope) = scope; property = zend_std_get_static_property_with_info(scope, name, BP_VAR_W, &prop_info); EG(fake_scope) = old_scope; |