1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bpo-43853: Handle sqlite3_value_text() errors (GH-25422)

Browse Source
This commit is contained in:
Erlend Egeberg Aasland 2021-06-04 20:34:00 +02:00 committed by GitHub
parent 8363ac8607
commit 006fd869e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/sqlite3/test/userfunctions.py
View File

@ -236,7 +236,9 @@ class FunctionTests(unittest.TestCase):
def test_param_string(self): def test_param_string(self):
cur = self.con.cursor() cur = self.con.cursor()
cur.execute("select isstring(?)", ("foo",)) for text in ["foo", str()]:
with self.subTest(text=text):
cur.execute("select isstring(?)", (text,))
val = cur.fetchone()[0] val = cur.fetchone()[0]
self.assertEqual(val, 1) self.assertEqual(val, 1)
@ -391,9 +393,9 @@ class AggregateTests(unittest.TestCase):
def test_aggr_check_param_str(self): def test_aggr_check_param_str(self):
cur = self.con.cursor() cur = self.con.cursor()
cur.execute("select checkType('str', ?)", ("foo",)) cur.execute("select checkTypes('str', ?, ?)", ("foo", str()))
val = cur.fetchone()[0] val = cur.fetchone()[0]
self.assertEqual(val, 1) self.assertEqual(val, 2)
def test_aggr_check_param_int(self): def test_aggr_check_param_int(self):
cur = self.con.cursor() cur = self.con.cursor()

3
Misc/NEWS.d/next/Library/2021-04-15-12-02-17.bpo-43853.XXCVAp.rst Normal file
View File

@ -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
Modules/_sqlite/connection.c
View File

@ -550,7 +550,6 @@ _pysqlite_build_py_params(sqlite3_context *context, int argc,
int i; int i;
sqlite3_value* cur_value; sqlite3_value* cur_value;
PyObject* cur_py_value; PyObject* cur_py_value;
const char* val_str;
args = PyTuple_New(argc); args = PyTuple_New(argc);
if (!args) { if (!args) {
@ -566,15 +565,19 @@ _pysqlite_build_py_params(sqlite3_context *context, int argc,
case SQLITE_FLOAT: case SQLITE_FLOAT:
cur_py_value = PyFloat_FromDouble(sqlite3_value_double(cur_value)); cur_py_value = PyFloat_FromDouble(sqlite3_value_double(cur_value));
break; break;
case SQLITE_TEXT: case SQLITE_TEXT: {
val_str = (const char*)sqlite3_value_text(cur_value); sqlite3 *db = sqlite3_context_db_handle(context);
cur_py_value = PyUnicode_FromString(val_str); const char *text = (const char *)sqlite3_value_text(cur_value);
/* TODO: have a way to show errors here */
if (!cur_py_value) { if (text == NULL && sqlite3_errcode(db) == SQLITE_NOMEM) {
PyErr_Clear(); PyErr_NoMemory();
cur_py_value = Py_NewRef(Py_None); goto error;
} }
Py_ssize_t size = sqlite3_value_bytes(cur_value);
cur_py_value = PyUnicode_FromStringAndSize(text, size);
break; break;
}
case SQLITE_BLOB: { case SQLITE_BLOB: {
sqlite3 *db = sqlite3_context_db_handle(context); sqlite3 *db = sqlite3_context_db_handle(context);
const void *blob = sqlite3_value_blob(cur_value); const void *blob = sqlite3_value_blob(cur_value);