Raise DataError if query contains null chars

Author: Erlend E. Aasland

Lib/sqlite3/test/regression.py

@@ -338,12 +338,16 @@ def test_invalid_isolation_level_type(self):
 
     def test_null_character(self):
         # Issue #21147
-        con = sqlite.connect(":memory:")
-        self.assertRaises(ValueError, con, "\0select 1")
-        self.assertRaises(ValueError, con, "select 1\0")
-        cur = con.cursor()
-        self.assertRaises(ValueError, cur.execute, " \0select 2")
-        self.assertRaises(ValueError, cur.execute, "select 2\0")
+        cur = self.con.cursor()
+        queries = ["\0select 1", "select 1\0"]
+        msg = "the query contains a null character"
+        for query in queries:
+            with self.subTest(query=query):
+                self.assertRaisesRegex(sqlite.DataError, msg,
+                                       self.con.execute, query)
+            with self.subTest(query=query):
+                self.assertRaisesRegex(sqlite.DataError, msg,
+                                       cur.execute, query)
 
     def test_surrogates(self):
         con = sqlite.connect(":memory:")

Modules/_sqlite/statement.c

@@ -67,7 +67,7 @@ pysqlite_statement_create(pysqlite_Connection *connection, PyObject *sql)
         return NULL;
     }
     if (strlen(sql_cstr) != (size_t)size) {
-        PyErr_SetString(PyExc_ValueError,
+        PyErr_SetString(connection->DataError,
                         "the query contains a null character");
         return NULL;
     }