Skip to content

sqlite: lossily coerce invalid UTF-8 in custom collation callback #4219

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
abonander merged 1 commit into from
Apr 7, 2026
Merged

sqlite: lossily coerce invalid UTF-8 in custom collation callback #4219

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions sqlx-sqlite/src/connection/collation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ use std::ffi::CString;
use std::fmt::{self, Debug, Formatter};
use std::os::raw::{c_int, c_void};
use std::slice;
use std::str::from_utf8_unchecked;
use std::sync::Arc;

use libsqlite3_sys::{sqlite3_create_collation_v2, SQLITE_OK, SQLITE_UTF8};
Expand Down Expand Up @@ -137,15 +136,19 @@ where
let right_len = usize::try_from(right_len)
.unwrap_or_else(|_| panic!("right_len out of range: {right_len}"));

// SQLite explicitly documents that invalid UTF-8 may be passed into
// application-defined collating sequences. The safe `Fn(&str, &str)`
// signature exposed to users must never observe invalid UTF-8, so
// lossily coerce the raw bytes here.
let s1 = {
let c_slice = slice::from_raw_parts(left_ptr as *const u8, left_len);
from_utf8_unchecked(c_slice)
String::from_utf8_lossy(c_slice)
};
let s2 = {
let c_slice = slice::from_raw_parts(right_ptr as *const u8, right_len);
from_utf8_unchecked(c_slice)
String::from_utf8_lossy(c_slice)
};
let t = (*boxed_f)(s1, s2);
let t = (*boxed_f)(&s1, &s2);

match t {
Ordering::Less => -1,
Expand Down
Loading