mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-23 09:19:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

bpo-43752: Fix sqlite3 regression for zero-sized blobs with converters (GH-25228)

Browse source
This commit is contained in:
Erlend Egeberg Aasland 2021-04-14 13:18:49 +02:00 • committed by GitHub
parent 333d10cbb5
commit 6f1e8ccffa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/sqlite3/test/types.py
View file

@ -255,7 +255,9 @@ class DeclTypesTests(unittest.TestCase):
def test_convert_zero_sized_blob(self):
self.con.execute("insert into test(cbin) values (?)", (b"",))
cur = self.con.execute("select cbin from test")
self.assertEqual(cur.fetchone()[0], b"blobish")
# Zero-sized blobs with converters returns None. This differs from
# blobs without a converter, where b"" is returned.
self.assertIsNone(cur.fetchone()[0])
class ColNamesTests(unittest.TestCase):

3
Misc/NEWS.d/next/Library/2021-04-06-21-18-29.bpo-43752.K7qmAF.rst Normal file
View file

@ -0,0 +1,3 @@
Fix :mod:`sqlite3` regression for zero-sized blobs with converters, where
``b""`` was returned instead of ``None``. The regression was introduced by
GH-24723. Patch by Erlend E. Aasland.

25
Modules/_sqlite/cursor.c
View file

@ -240,7 +240,6 @@ _pysqlite_fetch_one_row(pysqlite_Cursor* self)
{
int i, numcols;
PyObject* row;
PyObject* item = NULL;
int coltype;
PyObject* converter;
PyObject* converted;
@ -282,18 +281,22 @@ _pysqlite_fetch_one_row(pysqlite_Cursor* self)
*/
if (converter != Py_None) {
const void *blob = sqlite3_column_blob(self->statement->st, i);
if (blob == NULL && sqlite3_errcode(db) == SQLITE_NOMEM) {
PyErr_NoMemory();
goto error;
if (blob == NULL) {
if (sqlite3_errcode(db) == SQLITE_NOMEM) {
PyErr_NoMemory();
goto error;
}
converted = Py_NewRef(Py_None);
}
nbytes = sqlite3_column_bytes(self->statement->st, i);
item = PyBytes_FromStringAndSize(blob, nbytes);
if (item == NULL) {
goto error;
else {
nbytes = sqlite3_column_bytes(self->statement->st, i);
PyObject *item = PyBytes_FromStringAndSize(blob, nbytes);
if (item == NULL) {
goto error;
}
converted = PyObject_CallOneArg(converter, item);
Py_DECREF(item);
}
converted = PyObject_CallOneArg(converter, item);
Py_DECREF(item);
} else {
Py_BEGIN_ALLOW_THREADS
coltype = sqlite3_column_type(self->statement->st, i);