[Python-checkins] cpython (merge 3.3 -> default): (Merge 3.3) Issue #20026: Fix the sqlite module to handle correctly invalid

Thu Dec 19 16:41:59 CET 2013

http://hg.python.org/cpython/rev/f9b6c8ef55b6
changeset: 88063:f9b6c8ef55b6
parent: 88060:6b17803bfddd
parent: 88062:11a161cf0e5d
user: Victor Stinner <victor.stinner at gmail.com>
date: Thu Dec 19 16:39:00 2013 +0100
summary:
 (Merge 3.3) Issue #20026: Fix the sqlite module to handle correctly invalid
isolation level (wrong type).
files:
 Lib/sqlite3/test/regression.py | 5 +++++
 Misc/NEWS | 3 +++
 Modules/_sqlite/connection.c | 5 ++++-
 3 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/Lib/sqlite3/test/regression.py b/Lib/sqlite3/test/regression.py
--- a/Lib/sqlite3/test/regression.py
+++ b/Lib/sqlite3/test/regression.py
@@ -330,6 +330,11 @@
 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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -44,6 +44,9 @@
 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
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -128,7 +128,10 @@
 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);
-- 
Repository URL: http://hg.python.org/cpython
