mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 17:55:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 78898 via svnmerge from

Browse source 
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:").
........
This commit is contained in:
Victor Stinner 2010-03-21 13:52:56 +00:00
parent 872d636cc9
commit 57d43b29f3
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/sqlite3/test/regression.py
View file

@ -167,6 +167,12 @@ class RegressionTests(unittest.TestCase):
self.assertRaises(UnicodeEncodeError, setattr, con,
"isolation_level", u"\xe9")
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")

6
Modules/_sqlite/connection.c
View file

@ -1051,6 +1051,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) {