From 09e4697ad1c759138aa4c576b97120775e90313b Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Sun, 21 Mar 2010 20:29:20 +0000 Subject: [PATCH] Merged revisions 78899 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r78899 | victor.stinner | 2010-03-13 04:28:34 +0100 (sam., 13 mars 2010) | 14 lines Merged revisions 78898 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78898 | victor.stinner | 2010-03-13 04:27:07 +0100 (sam., 13 mars 2010) | 7 lines sqlite3: Fix a segfault on calling a connection with something else than a string. Initialize all attributes to be able to call the statement destructor on error. Avoid also a duplicate connection in some tests: setUp() does already open a connection (":memory:"). ........ ................ --- Lib/sqlite3/test/regression.py | 7 +++++++ Modules/_sqlite/connection.c | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/Lib/sqlite3/test/regression.py b/Lib/sqlite3/test/regression.py index 2e61acf8cb9..da445519d96 100644 --- a/Lib/sqlite3/test/regression.py +++ b/Lib/sqlite3/test/regression.py @@ -176,6 +176,13 @@ class RegressionTests(unittest.TestCase): class MyStr(str): pass self.con.execute("select ?", (MyStr("abc"),)) + def CheckConnectionCall(self): + """ + Call a connection with a non-string SQL request: check error handling + of the statement constructor. + """ + self.assertRaises(sqlite.Warning, self.con, 1) + def suite(): regression_suite = unittest.makeSuite(RegressionTests, "Check") return unittest.TestSuite((regression_suite,)) diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index 08588bcdeee..4b8088d0f5e 100644 --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -979,6 +979,12 @@ PyObject* pysqlite_connection_call(pysqlite_Connection* self, PyObject* args, Py return NULL; } + statement->db = NULL; + statement->st = NULL; + statement->sql = NULL; + statement->in_use = 0; + statement->in_weakreflist = NULL; + rc = pysqlite_statement_create(statement, self, sql); if (rc != SQLITE_OK) {