Review

bschoenmaeckers · bschoenmaeckers · commit dfe90e53e854 · 2026-05-18T11:35:39.000+02:00
diff --git a/crates/capi/src/tupleobject.rs b/crates/capi/src/tupleobject.rs
@@ -1,13 +1,14 @@
 use crate::PyObject;
 use crate::object::define_py_check;
 use crate::pystate::with_vm;
+use core::ffi::c_int;
 use core::slice;
 use rustpython_vm::PyResult;
 use rustpython_vm::builtins::PyTuple;
 use rustpython_vm::sliceable::SliceableSequenceOp;
 
-define_py_check!(fn PyTuple_Check, types.int_type);
-define_py_check!(exact fn PyTuple_CheckExact, types.int_type);
+define_py_check!(fn PyTuple_Check, types.tuple_type);
+define_py_check!(exact fn PyTuple_CheckExact, types.tuple_type);
 
 #[unsafe(no_mangle)]
 pub extern "C" fn PyTuple_New(len: isize) -> *mut PyObject {
@@ -28,12 +29,15 @@ pub unsafe extern "C" fn PyTuple_FromArray(
     size: isize,
 ) -> *mut PyObject {
     with_vm(|vm| {
-        let slice = unsafe { slice::from_raw_parts(array, size as usize) };
+        let size = size
+            .try_into()
+            .map_err(|_| vm.new_system_error("negative size passed to Tuple_FromArray"))?;
+        let slice = unsafe { slice::from_raw_parts(array, size) };
         let elements = slice
             .iter()
             .map(|ptr| unsafe { &**ptr }.to_owned())
             .collect::<Vec<_>>();
-        vm.new_tuple(elements)
+        Ok(vm.new_tuple(elements))
     })
 }
 
@@ -42,8 +46,10 @@ pub extern "C" fn PyTuple_SetItem(
     _tuple: *mut PyObject,
     _pos: isize,
     _value: *mut PyObject,
-) -> *mut PyObject {
-    with_vm::<PyResult, _>(|vm| Err(vm.new_not_implemented_error("Tuple objects are immutable")))
+) -> c_int {
+    with_vm::<PyResult<()>, _>(
+        |vm| Err(vm.new_not_implemented_error("Tuple objects are immutable")),
+    )
 }
 
 #[unsafe(no_mangle)]
@@ -75,9 +81,11 @@ pub unsafe extern "C" fn PyTuple_GetSlice(
     high: isize,
 ) -> *mut PyObject {
     with_vm(|vm| {
-        let slice = unsafe { &*tuple }
-            .try_downcast_ref::<PyTuple>(vm)?
-            .do_slice(low as usize..high as usize);
+        let tuple = unsafe { &*tuple }.try_downcast_ref::<PyTuple>(vm)?;
+        let len = tuple.__len__() as isize;
+        let low = low.clamp(0, len);
+        let high = high.clamp(low, len);
+        let slice = tuple.do_slice(low as usize..high as usize);
         Ok(vm.ctx.new_tuple(slice))
     })
 }
