Commit87fc9f7

committed

classderived: handle tp_dealloc called after tp_clear

Because tp_clear sets tpHandle to NULL, it can't be used.Fortunately, we can simply read object's type from pyHandle.

1 parent92cde67 commit87fc9f7Copy full SHA for 87fc9f7

File tree

-1

lines changed

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,8 @@ internal ClassDerivedObject(Type tp) : base(tp)`
`75`	`75`	`// So we don't call PyObject_GC_Del here and instead we set the python`
`76`	`76`	`// reference to a weak reference so that the C# object can be collected.`
`77`	`77`	`GCHandlegc=GCHandle.Alloc(self,GCHandleType.Weak);`
`78`		`-Marshal.WriteIntPtr(self.pyHandle,ObjectOffset.magic(self.tpHandle),(IntPtr)gc);`
	`78`	`+intgcOffset=ObjectOffset.magic(Runtime.PyObject_TYPE(self.pyHandle));`
	`79`	`+Marshal.WriteIntPtr(self.pyHandle,gcOffset,(IntPtr)gc);`
`79`	`80`	`self.gcHandle.Free();`
`80`	`81`	`self.gcHandle=gc;`
`81`	`82`	`}`

Comments

(0)