Skip to content

Fix ctypes restype assignment #9615

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
youknowone merged 5 commits into from
Nov 4, 2026
Merged

Fix ctypes restype assignment #9615

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9d18226
Allow reentrant ctypes restype finalizers
youknowdot Nov 3, 2026
e04b531
Preserve explicit ctypes restype None
youknowdot Nov 3, 2026
636dcb5
Expose ctypes class restype default
youknowdot Nov 3, 2026
a5e3bad
Fix ctypes getter receiver type
youknowdot Nov 3, 2026
3d60e79
Release restype getter guard before class fallback
youknowdot Nov 3, 2026
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
19 changes: 12 additions & 7 deletions crates/vm/src/stdlib/_ctypes/function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1848,20 +1848,25 @@ impl AsBuffer for PyCFuncPtr {
impl Py<PyCFuncPtr> {
// restype getter/setter
#[pygetset]
fn restype(&self) -> Option<PyObjectRef> {
self.restype.read().clone()
fn restype(zelf: &Self, vm: &VirtualMachine) -> Option<PyObjectRef> {
let restype = zelf.restype.read().clone();
restype.or_else(|| {
zelf.as_object()
.class()
.get_attr(vm.ctx.intern_str("_restype_"))
})
}

#[pygetset(setter)]
fn set_restype(&self, value: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
// Must be type, callable, or None
if vm.is_none(&value) {
*self.restype.write() = None;
} else if value.downcast_ref::<PyType>().is_some() || value.is_callable() {
*self.restype.write() = Some(value);
} else {
if !vm.is_none(&value) && value.downcast_ref::<PyType>().is_none() && !value.is_callable() {
return Err(vm.new_type_error("restype must be a type, a callable, or None"));
}
// An explicit None requests a void result; it is distinct from unset.
let old = self.restype.write().replace(value);
// Finalizers on the previous value can re-enter this setter.
drop(old);
Ok(())
}

Expand Down
Loading