Skip to content

Enforce valid UTF-8 encoding for sqlite collation names #6015

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 2 commits into from
Jul 21, 2025
Merged

Enforce valid UTF-8 encoding for sqlite collation names #6015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5910fcd
Make public `PyStr::ensure_valid_utf8`
ever0de Jul 21, 2025
67a6e13
Enforce valid UTF-8 encoding for sqlite collation names
ever0de Jul 21, 2025
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
2 changes: 0 additions & 2 deletions Lib/test/test_sqlite3/test_regression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,6 @@ def test_connection_call(self):
"""
self.assertRaises(TypeError, self.con, b"select 1")

# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_collation(self):
def collation_cb(a, b):
return 1
Expand Down
1 change: 1 addition & 0 deletions stdlib/src/sqlite.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1163,6 +1163,7 @@ mod _sqlite {
callable: PyObjectRef,
vm: &VirtualMachine,
) -> PyResult<()> {
name.ensure_valid_utf8(vm)?;
let name = name.to_cstring(vm)?;
let db = self.db_lock(vm)?;
let Some(data) = CallbackData::new(callable.clone(), vm) else {
Expand Down
2 changes: 1 addition & 1 deletion vm/src/builtins/str.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ impl PyStr {
self.data.as_str()
}

fn ensure_valid_utf8(&self, vm: &VirtualMachine) -> PyResult<()> {
pub fn ensure_valid_utf8(&self, vm: &VirtualMachine) -> PyResult<()> {
if self.is_utf8() {
Ok(())
} else {
Expand Down
Loading