]> granicus.if.org Git - php/commitdiff
Fixed crash
authorDmitry Stogov <dmitry@zend.com>
Fri, 25 Jan 2019 08:53:31 +0000 (11:53 +0300)
committerDmitry Stogov <dmitry@zend.com>
Fri, 25 Jan 2019 08:53:31 +0000 (11:53 +0300)
ext/opcache/Optimizer/zend_inference.c

index 69ccda0d062af9dffdd56d9467b8a6f0f570711e..648e4e621c95d20abfe40c4a155cb86c7a160107 100644 (file)
@@ -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);