Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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:").
  ........
................
This commit is contained in:
Victor Stinner 2010-03-21 20:29:20 +00:00
parent 8a685f7184
commit 09e4697ad1
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/sqlite3/test/regression.py
View File

@ -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,))

6
Modules/_sqlite/connection.c
View File

@ -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) {