fix(sqlite): produce correct error for surrogate characters (#5962)

ever0de · web-flow · commit d42e8f004256 · 2025-07-14T14:21:36.000+09:00
diff --git a/Lib/test/test_sqlite3/test_userfunctions.py b/Lib/test/test_sqlite3/test_userfunctions.py
@@ -354,8 +354,6 @@ def test_return_non_contiguous_blob(self):
             cur = self.con.execute("select return_noncont_blob()")
             cur.fetchone()
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_param_surrogates(self):
         self.assertRaisesRegex(UnicodeEncodeError, "surrogates not allowed",
                                self.con.execute, "select spam(?)",
diff --git a/stdlib/src/sqlite.rs b/stdlib/src/sqlite.rs
@@ -2965,12 +2965,10 @@ mod _sqlite {
     }
 
     fn str_to_ptr_len(s: &PyStr, vm: &VirtualMachine) -> PyResult<(*const libc::c_char, i32)> {
-        let s = s
-            .to_str()
-            .ok_or_else(|| vm.new_unicode_encode_error("surrogates not allowed"))?;
-        let len = c_int::try_from(s.len())
+        let s_str = s.try_to_str(vm)?;
+        let len = c_int::try_from(s_str.len())
             .map_err(|_| vm.new_overflow_error("TEXT longer than INT_MAX bytes"))?;
-        let ptr = s.as_ptr().cast();
+        let ptr = s_str.as_ptr().cast();
         Ok((ptr, len))
     }
 

Original file line number	Diff line number	Diff line change
`@@ -2965,12 +2965,10 @@ mod _sqlite {`
`2965`	`2965`	`}`
`2966`	`2966`
`2967`	`2967`	`fn str_to_ptr_len(s: &PyStr, vm: &VirtualMachine) -> PyResult<(*const libc::c_char, i32)> {`
`2968`		`- let s = s`
`2969`		`- .to_str()`
`2970`		`- .ok_or_else(\|\| vm.new_unicode_encode_error("surrogates not allowed"))?;`
`2971`		`- let len = c_int::try_from(s.len())`
	`2968`	`+ let s_str = s.try_to_str(vm)?;`
	`2969`	`+ let len = c_int::try_from(s_str.len())`
`2972`	`2970`	`.map_err(\|_\| vm.new_overflow_error("TEXT longer than INT_MAX bytes"))?;`
`2973`		`- let ptr = s.as_ptr().cast();`
	`2971`	`+ let ptr = s_str.as_ptr().cast();`
`2974`	`2972`	`Ok((ptr, len))`
`2975`	`2973`	`}`
`2976`	`2974`