From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Sun, 21 Mar 2010 13:52:56 +0000 (+0000)
Subject: Merged revisions 78898 via svnmerge from
X-Git-Tag: v2.6.6rc1~574
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=57d43b29f39d8ac59d0129355f6d3663a35e254a;p=python

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:").
........
---

diff --git a/Lib/sqlite3/test/regression.py b/Lib/sqlite3/test/regression.py
index d07c237fd4..2a519dcea2 100644
--- a/Lib/sqlite3/test/regression.py
+++ b/Lib/sqlite3/test/regression.py
@@ -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")
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index 309b16852c..7ee11a988f 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -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) {