Skip to content

sqlite3: validate narg before creating functions/aggregates #8532

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

Open
ever0de wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −3
Open

sqlite3: validate narg before creating functions/aggregates #8532

Show file tree
Hide file tree
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
3 changes: 0 additions & 3 deletions Lib/test/test_sqlite3/test_userfunctions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@ def setUp(self):
def tearDown(self):
self.con.close()

@unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for invalid num args
def test_func_error_on_create(self):
with self.assertRaisesRegex(sqlite.ProgrammingError, "not -100"):
self.con.create_function("bla", -100, lambda x: 2*x)
Expand Down Expand Up @@ -514,7 +513,6 @@ def test_win_sum_int(self):
self.cur.execute(self.query % "sumint")
self.assertEqual(self.cur.fetchall(), self.expected)

@unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for invalid num args
def test_win_error_on_create(self):
with self.assertRaisesRegex(sqlite.ProgrammingError, "not -100"):
self.con.create_window_function("shouldfail", -100, WindowSumInt)
Expand Down Expand Up @@ -649,7 +647,6 @@ def setUp(self):
def tearDown(self):
self.con.close()

@unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for invalid num args
def test_aggr_error_on_create(self):
with self.assertRaisesRegex(sqlite.ProgrammingError, "not -100"):
self.con.create_function("bla", -100, AggrSum)
Expand Down
19 changes: 19 additions & 0 deletions crates/stdlib/src/_sqlite3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1279,6 +1279,7 @@ mod _sqlite3 {
SQLITE_UTF8
};
let db = self.db_lock(vm)?;
check_num_params(&db, args.narg, "narg", vm)?;
let Some(data) = CallbackData::new(args.func, vm) else {
return db.create_function(
name.as_ptr(),
Expand Down Expand Up @@ -1310,6 +1311,7 @@ mod _sqlite3 {
fn create_aggregate(&self, args: CreateAggregateArgs, vm: &VirtualMachine) -> PyResult<()> {
let name = args.name.to_cstring(vm)?;
let db = self.db_lock(vm)?;
check_num_params(&db, args.narg, "n_arg", vm)?;
let Some(data) = CallbackData::new(args.aggregate_class, vm) else {
return db.create_function(
name.as_ptr(),
Expand Down Expand Up @@ -1392,6 +1394,7 @@ mod _sqlite3 {
) -> PyResult<()> {
let name = name.to_cstring(vm)?;
let db = self.db_lock(vm)?;
check_num_params(&db, narg, "num_params", vm)?;
let Some(data) = CallbackData::new(aggregate_class, vm) else {
unsafe {
sqlite3_create_window_function(
Expand Down Expand Up @@ -3475,6 +3478,22 @@ mod _sqlite3 {
Ok(obj)
}

fn check_num_params(
db: &Sqlite,
n: c_int,
param_name: &str,
vm: &VirtualMachine,
) -> PyResult<()> {
let limit = unsafe { sqlite3_limit(db.db, SQLITE_LIMIT_FUNCTION_ARG, -1) };
if n < -1 || n > limit {
return Err(new_programming_error(
vm,
format!("'{param_name}' must be between -1 and {limit}, not {n}"),
));
}
Ok(())
}

fn ptr_to_str<'a>(p: *const libc::c_char, vm: &VirtualMachine) -> PyResult<&'a str> {
if p.is_null() {
return Err(vm.new_memory_error("string pointer is null"));
Expand Down
Loading