Skip to content

Fix ctypes argtypes handling #9613

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 argtypes handling #9613

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fba93d0
Avoid locking across ctypes argtypes callbacks
youknowdot Nov 3, 2026
0dc9234
Expose ctypes class argtypes default
youknowdot Nov 3, 2026
810ff33
Fix ctypes getter receiver type
youknowdot Nov 3, 2026
f63c905
Release ctypes argtypes read guard before class lookup
youknowdot Nov 3, 2026
a43ce9a
Use core for argtypes value replacement
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
56 changes: 31 additions & 25 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 @@ -1155,24 +1155,25 @@ fn compute_ret_spec(

/// Extract call information (argtypes, restype) from PyCFuncPtr
fn extract_call_info(zelf: &Py<PyCFuncPtr>, vm: &VirtualMachine) -> PyResult<CallInfo> {
// Clone before calling Python sequence methods, which can change argtypes.
let argtypes = zelf.argtypes.read().clone();
// Get argtypes - first from instance, then from type's _argtypes_
let explicit_arg_types: Option<Vec<PyTypeRef>> =
if let Some(argtypes_obj) = zelf.argtypes.read().as_ref() {
if !vm.is_none(argtypes_obj) {
Some(extract_arg_types(argtypes_obj, vm)?)
} else {
None // argtypes is None -> use ConvParam
}
} else if let Some(class_argtypes) = zelf
.as_object()
.class()
.get_attr(vm.ctx.intern_str("_argtypes_"))
&& !vm.is_none(&class_argtypes)
{
Some(extract_arg_types(&class_argtypes, vm)?)
let explicit_arg_types: Option<Vec<PyTypeRef>> = if let Some(argtypes_obj) = argtypes.as_ref() {
if !vm.is_none(argtypes_obj) {
Some(extract_arg_types(argtypes_obj, vm)?)
} else {
None // No argtypes -> use ConvParam
};
None // argtypes is None -> use ConvParam
}
} else if let Some(class_argtypes) = zelf
.as_object()
.class()
.get_attr(vm.ctx.intern_str("_argtypes_"))
&& !vm.is_none(&class_argtypes)
{
Some(extract_arg_types(&class_argtypes, vm)?)
} else {
None // No argtypes -> use ConvParam
};

// Get restype - first from instance, then from class's _restype_
let restype_obj = zelf.restype.read().clone().or_else(|| {
Expand Down Expand Up @@ -1867,21 +1868,26 @@ impl Py<PyCFuncPtr> {

// argtypes getter/setter
#[pygetset]
fn argtypes(&self, vm: &VirtualMachine) -> PyObjectRef {
self.argtypes
.read()
.clone()
.unwrap_or_else(|| vm.ctx.empty_tuple.clone().into())
fn argtypes(zelf: &Self, vm: &VirtualMachine) -> Option<PyObjectRef> {
let argtypes = zelf.argtypes.read().clone();
argtypes.or_else(|| {
zelf.as_object()
.class()
.get_attr(vm.ctx.intern_str("_argtypes_"))
})
}

#[pygetset(name = "argtypes", setter)]
fn set_argtypes(&self, value: PyObjectRef, vm: &VirtualMachine) {
if vm.is_none(&value) {
*self.argtypes.write() = None;
let value = if vm.is_none(&value) {
None
} else {
// Store the argtypes object directly as it is
*self.argtypes.write() = Some(value);
}
Some(value)
};
let old = core::mem::replace(&mut *self.argtypes.write(), value);
// Finalizers on the previous value can re-enter this setter.
drop(old);
}

// errcheck getter/setter
Expand Down
Loading