Fix get_unresolved_initializer for static props

nikic · nikic · commit bb75a537719c · 2019-02-22T11:25:52.000+01:00
For static props the offset is a simple index.
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -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)];
 		}

Original file line number	Diff line number	Diff line change
`@@ -3275,7 +3275,7 @@ static void get_unresolved_initializer(zend_class_entry ce, const char *kind,`
`3275`	`3275`	`ZEND_HASH_FOREACH_STR_KEY_PTR(&ce->properties_info, key, prop) {`
`3276`	`3276`	`zval *val;`
`3277`	`3277`	`if (prop->flags & ZEND_ACC_STATIC) {`
`3278`		`- val = &ce->default_static_members_table[OBJ_PROP_TO_NUM(prop->offset)];`
	`3278`	`+ val = &ce->default_static_members_table[prop->offset];`
`3279`	`3279`	`} else {`
`3280`	`3280`	`val = &ce->default_properties_table[OBJ_PROP_TO_NUM(prop->offset)];`
`3281`	`3281`	`}`