Skip to content

bpo-43853: Handle sqlite3_value_text() errors #25422

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
merged 3 commits into from
Jun 4, 2021
Merged

bpo-43853: Handle sqlite3_value_text() errors #25422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b2bae8
Raise memory error if sqlite3_value_text() fails
Apr 15, 2021
0665639
Add NEWS
Apr 15, 2021
dca64c2
Add tests for empty strings
May 24, 2021
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
12 changes: 7 additions & 5 deletions Lib/sqlite3/test/userfunctions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,11 @@ def test_func_exception(self):

def test_param_string(self):
cur = self.con.cursor()
cur.execute("select isstring(?)", ("foo",))
val = cur.fetchone()[0]
self.assertEqual(val, 1)
for text in ["foo", str()]:
with self.subTest(text=text):
cur.execute("select isstring(?)", (text,))
val = cur.fetchone()[0]
self.assertEqual(val, 1)

def test_param_int(self):
cur = self.con.cursor()
Expand Down Expand Up @@ -391,9 +393,9 @@ def test_aggr_exception_in_finalize(self):

def test_aggr_check_param_str(self):
cur = self.con.cursor()
cur.execute("select checkType('str', ?)", ("foo",))
cur.execute("select checkTypes('str', ?, ?)", ("foo", str()))
val = cur.fetchone()[0]
self.assertEqual(val, 1)
self.assertEqual(val, 2)

def test_aggr_check_param_int(self):
cur = self.con.cursor()
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2021-04-15-12-02-17.bpo-43853.XXCVAp.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Improve :mod:`sqlite3` error handling: ``sqlite3_value_text()`` errors that
set ``SQLITE_NOMEM`` now raise :exc:`MemoryError`. Patch by Erlend E.
Aasland.
19 changes: 11 additions & 8 deletions Modules/_sqlite/connection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,6 @@ _pysqlite_build_py_params(sqlite3_context *context, int argc,
int i;
sqlite3_value* cur_value;
PyObject* cur_py_value;
const char* val_str;

args = PyTuple_New(argc);
if (!args) {
Expand All @@ -561,15 +560,19 @@ _pysqlite_build_py_params(sqlite3_context *context, int argc,
case SQLITE_FLOAT:
cur_py_value = PyFloat_FromDouble(sqlite3_value_double(cur_value));
break;
case SQLITE_TEXT:
val_str = (const char*)sqlite3_value_text(cur_value);
cur_py_value = PyUnicode_FromString(val_str);
/* TODO: have a way to show errors here */
if (!cur_py_value) {
PyErr_Clear();
cur_py_value = Py_NewRef(Py_None);
case SQLITE_TEXT: {
sqlite3 *db = sqlite3_context_db_handle(context);
const char *text = (const char *)sqlite3_value_text(cur_value);

if (text == NULL && sqlite3_errcode(db) == SQLITE_NOMEM) {
PyErr_NoMemory();
goto error;
}

Py_ssize_t size = sqlite3_value_bytes(cur_value);
cur_py_value = PyUnicode_FromStringAndSize(text, size);
break;
}
case SQLITE_BLOB: {
sqlite3 *db = sqlite3_context_db_handle(context);
const void *blob = sqlite3_value_blob(cur_value);
Expand Down