Use XtOffsetOf to calculate zend_object offset

Frederick888 · Frederick888 · commit 6ad2a632d81d · 2021-05-15T01:58:05.000+10:00
diff --git a/src/zend_container.h b/src/zend_container.h
@@ -92,7 +92,7 @@ class zend_container
     }
     static inline bitem *bnode_fetch_object_data(zend_object *obj)
     {
-        return (bitem *)(*((uintptr_t *)((char *)obj - sizeof(uintptr_t))));
+        return (bitem *)(*((uintptr_t *)((char *)obj - XtOffsetOf(bitem_object, std))));
     }
 };
 

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ class zend_container`
`92`	`92`	`}`
`93`	`93`	`static inline bitem bnode_fetch_object_data(zend_object obj)`
`94`	`94`	`{`
`95`		`- return (bitem )(((uintptr_t )((char )obj - sizeof(uintptr_t))));`
	`95`	`+ return (bitem )(((uintptr_t )((char )obj - XtOffsetOf(bitem_object, std))));`
`96`	`96`	`}`
`97`	`97`	`};`
`98`	`98`