Issue #20026: Fix the sqlite module to handle correctly invalid isolation level

(wrong type).

diff --git a/Lib/sqlite3/test/regression.py b/Lib/sqlite3/test/regression.py
index b927cb3ed1857d904808eb2bc41914879a1f7030..c557ab6785d0c469ad2e1a84819f9c46aac9b19e 100644 (file)
--- a/Lib/sqlite3/test/regression.py
+++ b/Lib/sqlite3/test/regression.py
@@ -330,6 +330,11 @@ class RegressionTests(unittest.TestCase):
             datetime.datetime(2012, 4, 4, 15, 6, 0, 123456),
         ])
 
+    def CheckInvalidIsolationLevelType(self):
+        # isolation level is a string, not an integer
+        self.assertRaises(TypeError,
+                          sqlite.connect, ":memory:", isolation_level=123)
+
 
 def suite():
     regression_suite = unittest.makeSuite(RegressionTests, "Check")

diff --git a/Misc/NEWS b/Misc/NEWS
index 554f2955049e697ff6189c0a0b424ba03b055f30..dec9424cbf53c51b1f31d7d1580d973e2f8491e4 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -29,6 +29,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #20026: Fix the sqlite module to handle correctly invalid isolation
+  level (wrong type).
+
 - Issue #18829: csv.Dialect() now checks type for delimiter, escapechar and
   quotechar fields.  Original patch by Vajrasky Kok.
 

diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index 451ea241bd3f317060c93202eeec411bc2be6435..8cf2d6aa80c9e444afa154753a7bed7dfd3717ee 100644 (file)
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -109,7 +109,10 @@ int pysqlite_connection_init(pysqlite_Connection* self, PyObject* args, PyObject
         Py_INCREF(isolation_level);
     }
     self->isolation_level = NULL;
-    pysqlite_connection_set_isolation_level(self, isolation_level);
+    if (pysqlite_connection_set_isolation_level(self, isolation_level) < 0) {
+        Py_DECREF(isolation_level);
+        return -1;
+    }
     Py_DECREF(isolation_level);
 
     self->statement_cache = (pysqlite_Cache*)PyObject_CallFunction((PyObject*)&pysqlite_CacheType, "Oi", self, cached_statements);