Fix endless recursion in Class_obj::GetInstanceFields (HaxeFoundation#1027)

profelis · web-flow · commit 09ffa2957678 · 2023-03-27T08:47:06.000+02:00
cpp::Pointer.mSuper points to same cpp::Pointer instance
diff --git a/src/hx/Class.cpp b/src/hx/Class.cpp
@@ -195,7 +195,7 @@ String Class_obj::__ToString() const { return mName; }
 
 Array<String> Class_obj::GetInstanceFields()
 {
-   Array<String> result = mSuper ? (*mSuper)->GetInstanceFields() : Array<String>(0,0);
+   Array<String> result = mSuper && (*mSuper).mPtr != this ? (*mSuper)->GetInstanceFields() : Array<String>(0,0);
    if (mMembers.mPtr)
       for(int m=0;m<mMembers->size();m++)
       {

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ String Class_obj::__ToString() const { return mName; }`
`195`	`195`
`196`	`196`	`Array<String> Class_obj::GetInstanceFields()`
`197`	`197`	`{`
`198`		`- Array<String> result = mSuper ? (*mSuper)->GetInstanceFields() : Array<String>(0,0);`
	`198`	`+ Array<String> result = mSuper && (mSuper).mPtr != this ? (mSuper)->GetInstanceFields() : Array<String>(0,0);`
`199`	`199`	`if (mMembers.mPtr)`
`200`	`200`	`for(int m=0;m<mMembers->size();m++)`
`201`	`201`	`{`