diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-01-25 11:53:31 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-01-25 11:53:31 +0300 |
| commit | 0ff71aead12bbc2e7dc57f00f7860a6ffdccea4d (patch) | |
| tree | dbf2c5ae7c261bb40fb1b3c8abcec56bcaa508e1 | |
| parent | 24085b187a7505aacb5bd76372f1522226656dd3 (diff) | |
| download | php-git-0ff71aead12bbc2e7dc57f00f7860a6ffdccea4d.tar.gz | |
Fixed crash
| -rw-r--r-- | ext/opcache/Optimizer/zend_inference.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c index 69ccda0d06..648e4e621c 100644 --- a/ext/opcache/Optimizer/zend_inference.c +++ b/ext/opcache/Optimizer/zend_inference.c @@ -2285,7 +2285,8 @@ static zend_property_info *lookup_prop_info(zend_class_entry *ce, zend_string *n zend_property_info *prop_info; /* If the class is linked, reuse the precise runtime logic. */ - if (ce->ce_flags & ZEND_ACC_LINKED) { + if ((ce->ce_flags & ZEND_ACC_LINKED) + && (!scope || (scope->ce_flags & ZEND_ACC_LINKED))) { zend_class_entry *prev_scope = EG(fake_scope); EG(fake_scope) = scope; prop_info = zend_get_property_info(ce, name, 1); |