]> granicus.if.org Git - php/commitdiff
Fix get_unresolved_initializer for static props
authorNikita Popov <nikita.ppv@gmail.com>
Fri, 22 Feb 2019 10:23:16 +0000 (11:23 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Fri, 22 Feb 2019 10:25:52 +0000 (11:25 +0100)
For static props the offset is a simple index.

ext/opcache/ZendAccelerator.c

index 48a59928b47d4d9b8f7f524098e5b4ec4ed37609..de6b86fdf4a7fa96afe961c1b3a2abb25f08f755 100644 (file)
@@ -3275,7 +3275,7 @@ static void get_unresolved_initializer(zend_class_entry *ce, const char **kind,
        ZEND_HASH_FOREACH_STR_KEY_PTR(&ce->properties_info, key, prop) {
                zval *val;
                if (prop->flags & ZEND_ACC_STATIC) {
-                       val = &ce->default_static_members_table[OBJ_PROP_TO_NUM(prop->offset)];
+                       val = &ce->default_static_members_table[prop->offset];
                } else {
                        val = &ce->default_properties_table[OBJ_PROP_TO_NUM(prop->offset)];
                }