Skip to content

Fixed double call to PyType_Ready in CLR MetaType's tp_new #1486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
filmor merged 1 commit into from
Jul 7, 2021
Merged

Fixed double call to PyType_Ready in CLR MetaType's tp_new #1486

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
It was incorrect to call PyType_Ready on a type returned by `PyType… 
….tp_new`. It should have not been allowed in the first place, but we accidentally cleared `Ready` from `tp_flags`. Instead, we will extend `tp_flags` and call `PyType_Modified` at the end of CLR MetaType.tp_new
  • Loading branch information
@lostmsu
lostmsu committed Jul 7, 2021
commit c1e5622abfed190fbafd420516cd09aaa6fa3790
7 changes: 4 additions & 3 deletions src/runtime/metatype.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}
Expand Down