diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-11-25 14:10:53 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-11-25 14:10:53 +0300 |
| commit | 0f2b6ece4ea2c4fe5173a40539aabd3ecdbc29f8 (patch) | |
| tree | 8877deea7d79c6431b4be7ad1c69d498690b1c43 /Zend/zend_API.c | |
| parent | 1de312d9b19fd024b90d52adc835f462ec12cb17 (diff) | |
| parent | 2ebf530946354e39e3d3df8f96813a06f495f930 (diff) | |
| download | php-git-0f2b6ece4ea2c4fe5173a40539aabd3ecdbc29f8.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #78868 (Calling __autoload() with incorrect EG(fake_scope) value)
Consolidate NEWS for 7.4.0 release
WIP: Merge NEWS
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 87cfd5f139..8868090b1b 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -3995,6 +3995,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; |