[Python-checkins] bpo-43368: Fix fetching empty bytes in sqlite3 (GH-24706)

[berkerpeksag]

https://github.com/python/cpython/commit/3b4b2cf418707c79f96689e401e3c703c0fdd4d2
commit: 3b4b2cf418707c79f96689e401e3c703c0fdd4d2
branch: master
author: Mariusz Felisiak <felisiak.mariusz at gmail.com>
committer: berkerpeksag <berker.peksag at gmail.com>
date: 2021-03-03T16:16:24+02:00
summary:

bpo-43368: Fix fetching empty bytes in sqlite3 (GH-24706)

Regression introduced in 47feb1feb28631b6647699b7633109aa85340966.

files:
A Misc/NEWS.d/next/Library/2021-03-02-13-45-05.bpo-43368.t9XEkQ.rst
M Lib/sqlite3/test/regression.py
M Modules/_sqlite/cursor.c

diff --git a/Lib/sqlite3/test/regression.py b/Lib/sqlite3/test/regression.py
index c8e0b27564ad1..417a53109c87c 100644
--- a/Lib/sqlite3/test/regression.py
+++ b/Lib/sqlite3/test/regression.py
@@ -409,6 +409,10 @@ def log(self, *args):
             self.con.execute("select 1")  # trigger seg fault
             method(None)
 
+    def test_return_empty_bytestring(self):
+        cur = self.con.execute("select X''")
+        val = cur.fetchone()[0]
+        self.assertEqual(val, b'')
 
 
 def suite():
diff --git a/Misc/NEWS.d/next/Library/2021-03-02-13-45-05.bpo-43368.t9XEkQ.rst b/Misc/NEWS.d/next/Library/2021-03-02-13-45-05.bpo-43368.t9XEkQ.rst
new file mode 100644
index 0000000000000..f9a4aa2935e3f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-03-02-13-45-05.bpo-43368.t9XEkQ.rst
@@ -0,0 +1,2 @@
+Fix a regression introduced in GH-24562, where an empty bytestring was fetched
+as ``None`` instead of ``b''`` in :mod:`sqlite3`. Patch by Mariusz Felisiak.
diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
index 23ab7451fdaa0..764eec5fbcac6 100644
--- a/Modules/_sqlite/cursor.c
+++ b/Modules/_sqlite/cursor.c
@@ -333,12 +333,8 @@ _pysqlite_fetch_one_row(pysqlite_Cursor* self)
             } else {
                 /* coltype == SQLITE_BLOB */
                 const char *blob = sqlite3_column_blob(self->statement->st, i);
-                if (!blob) {
-                    converted = Py_NewRef(Py_None);
-                } else {
-                    nbytes = sqlite3_column_bytes(self->statement->st, i);
-                    converted = PyBytes_FromStringAndSize(blob, nbytes);
-                }
+                nbytes = sqlite3_column_bytes(self->statement->st, i);
+                converted = PyBytes_FromStringAndSize(blob, nbytes);
             }
         }