aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-01-06 09:44:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'sqlite3: Improve SQLite error handling and fix C-string safety' from Ceferino Patino

Browse Source 
This PR addresses two related issues in the SQLite3 C API
implementation:
1. Properly sets error codes on the database object when handling SQL
preparation failures
2. Fixes C string handling in sqlite3_errstr_impl to ensure proper null-
termination
Error codes should be correctly set on the database object, making them
accessible to API consumers. Also fixes and issue where C strings
weren't properly null-terminated in error reporting functions, which
causes the issue in #2197 where messages all get pushed onto a single
line. Its possible that this also fixes a buffer overflow, but I'm not
actually sure what the behavior was.

Reviewed-by: Jussi Saurio <jussi.saurio@gmail.com>

Closes #2212
This commit is contained in:
Pekka Enberg
2025-07-24 14:40:37 +03:00
parent 62f5a42008 ae1ad65bd2
commit 648ad3e74d
1 changed files with 55 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
sqlite3/src/lib.rs
View File

@@ -219,15 +219,21 @@ pub unsafe extern "C" fn sqlite3_prepare_v2(
return SQLITE_MISUSE;
}
let db: &mut sqlite3 = &mut *raw_db;
let db = db.inner.lock().unwrap();
let mut db = db.inner.lock().unwrap();
let sql = CStr::from_ptr(sql);
let sql = match sql.to_str() {
Ok(s) => s,
Err(_) => return SQLITE_MISUSE,
Err(_) => {
db.err_code = SQLITE_MISUSE;
return SQLITE_MISUSE;
}
};
let stmt = match db.conn.prepare(sql) {
Ok(stmt) => stmt,
Err(_) => return SQLITE_ERROR,
Err(_) => {
db.err_code = SQLITE_ERROR;
return SQLITE_ERROR;
}
};
*out_stmt = Box::leak(Box::new(sqlite3_stmt::new(raw_db, stmt)));
SQLITE_OK
@@ -1026,62 +1032,62 @@ pub unsafe extern "C" fn sqlite3_libversion_number() -> ffi::c_int {
}
fn sqlite3_errstr_impl(rc: i32) -> *const ffi::c_char {
const ERROR_MESSAGES: [&str; 29] = [
"not an error", // SQLITE_OK
"SQL logic error", // SQLITE_ERROR
"", // SQLITE_INTERNAL
"access permission denied", // SQLITE_PERM
"query aborted", // SQLITE_ABORT
"database is locked", // SQLITE_BUSY
"database table is locked", // SQLITE_LOCKED
"out of memory", // SQLITE_NOMEM
"attempt to write a readonly database", // SQLITE_READONLY
"interrupted", // SQLITE_INTERRUPT
"disk I/O error", // SQLITE_IOERR
"database disk image is malformed", // SQLITE_CORRUPT
"unknown operation", // SQLITE_NOTFOUND
"database or disk is full", // SQLITE_FULL
"unable to open database file", // SQLITE_CANTOPEN
"locking protocol", // SQLITE_PROTOCOL
"", // SQLITE_EMPTY
"database schema has changed", // SQLITE_SCHEMA
"string or blob too big", // SQLITE_TOOBIG
"constraint failed", // SQLITE_CONSTRAINT
"datatype mismatch", // SQLITE_MISMATCH
"bad parameter or other API misuse", // SQLITE_MISUSE
static ERROR_MESSAGES: [&[u8]; 29] = [
b"not an error\0", // SQLITE_OK
b"SQL logic error\0", // SQLITE_ERROR
b"\0", // SQLITE_INTERNAL
b"access permission denied\0", // SQLITE_PERM
b"query aborted\0", // SQLITE_ABORT
b"database is locked\0", // SQLITE_BUSY
b"database table is locked\0", // SQLITE_LOCKED
b"out of memory\0", // SQLITE_NOMEM
b"attempt to write a readonly database\0", // SQLITE_READONLY
b"interrupted\0", // SQLITE_INTERRUPT
b"disk I/O error\0", // SQLITE_IOERR
b"database disk image is malformed\0", // SQLITE_CORRUPT
b"unknown operation\0", // SQLITE_NOTFOUND
b"database or disk is full\0", // SQLITE_FULL
b"unable to open database file\0", // SQLITE_CANTOPEN
b"locking protocol\0", // SQLITE_PROTOCOL
b"\0", // SQLITE_EMPTY
b"database schema has changed\0", // SQLITE_SCHEMA
b"string or blob too big\0", // SQLITE_TOOBIG
b"constraint failed\0", // SQLITE_CONSTRAINT
b"datatype mismatch\0", // SQLITE_MISMATCH
b"bad parameter or other API misuse\0", // SQLITE_MISUSE
#[cfg(feature = "lfs")]
"", // SQLITE_NOLFS
b"\0", // SQLITE_NOLFS
#[cfg(not(feature = "lfs"))]
"large file support is disabled", // SQLITE_NOLFS
"authorization denied", // SQLITE_AUTH
"", // SQLITE_FORMAT
"column index out of range", // SQLITE_RANGE
"file is not a database", // SQLITE_NOTADB
"notification message", // SQLITE_NOTICE
"warning message", // SQLITE_WARNING
b"large file support is disabled\0", // SQLITE_NOLFS
b"authorization denied\0", // SQLITE_AUTH
b"\0", // SQLITE_FORMAT
b"column index out of range\0", // SQLITE_RANGE
b"file is not a database\0", // SQLITE_NOTADB
b"notification message\0", // SQLITE_NOTICE
b"warning message\0", // SQLITE_WARNING
];
const UNKNOWN_ERROR: &str = "unknown error";
const ABORT_ROLLBACK: &str = "abort due to ROLLBACK";
const ANOTHER_ROW_AVAILABLE: &str = "another row available";
const NO_MORE_ROWS_AVAILABLE: &str = "no more rows available";
static UNKNOWN_ERROR: &[u8] = b"unknown error\0";
static ABORT_ROLLBACK: &[u8] = b"abort due to ROLLBACK\0";
static ANOTHER_ROW_AVAILABLE: &[u8] = b"another row available\0";
static NO_MORE_ROWS_AVAILABLE: &[u8] = b"no more rows available\0";
match rc {
SQLITE_ABORT_ROLLBACK => ABORT_ROLLBACK.as_ptr() as *const ffi::c_char,
SQLITE_ROW => ANOTHER_ROW_AVAILABLE.as_ptr() as *const ffi::c_char,
SQLITE_DONE => NO_MORE_ROWS_AVAILABLE.as_ptr() as *const ffi::c_char,
let msg = match rc {
SQLITE_ABORT_ROLLBACK => ABORT_ROLLBACK,
SQLITE_ROW => ANOTHER_ROW_AVAILABLE,
SQLITE_DONE => NO_MORE_ROWS_AVAILABLE,
_ => {
let rc = rc & 0xff;
if rc >= 0
&& rc < ERROR_MESSAGES.len() as i32
&& !ERROR_MESSAGES[rc as usize].is_empty()
{
ERROR_MESSAGES[rc as usize].as_ptr() as *const ffi::c_char
let idx = rc & 0xff;
if (idx as usize) < ERROR_MESSAGES.len() && !ERROR_MESSAGES[rc as usize].is_empty() {
ERROR_MESSAGES[rc as usize]
} else {
UNKNOWN_ERROR.as_ptr() as *const ffi::c_char
UNKNOWN_ERROR
}
}
}
};
msg.as_ptr() as *const ffi::c_char
}
#[no_mangle]