Merge pull request #1486 from losttech/bugs/PythonInheritsDotNet_DoubleTypeReady

filmor · web-flow · commit 13916390c27e · 2021-07-08T01:32:55.000+02:00
Fixed double call to `PyType_Ready` in CLR MetaType's `tp_new`
diff --git a/src/runtime/metatype.cs b/src/runtime/metatype.cs
@@ -145,7 +145,9 @@ public static IntPtr tp_new(IntPtr tp, IntPtr args, IntPtr kw)
                 return IntPtr.Zero;
             }
 
-            var flags = TypeFlags.Default;
+            var flags = (TypeFlags)Util.ReadCLong(type, TypeOffset.tp_flags);
+            if (!flags.HasFlag(TypeFlags.Ready))
+                throw new NotSupportedException("PyType.tp_new returned an incomplete type");
             flags |= TypeFlags.HasClrInstance;
             flags |= TypeFlags.HeapType;
             flags |= TypeFlags.BaseType;
@@ -170,8 +172,7 @@ public static IntPtr tp_new(IntPtr tp, IntPtr args, IntPtr kw)
             IntPtr gc = Marshal.ReadIntPtr(base_type, Offsets.tp_clr_inst);
             Marshal.WriteIntPtr(type, Offsets.tp_clr_inst, gc);
 
-            if (Runtime.PyType_Ready(type) != 0)
-                throw PythonException.ThrowLastAsClrException();
+            Runtime.PyType_Modified(new BorrowedReference(type));
 
             return type;
         }
