[Python-checkins] r79236 - in python/branches/release31-maint: Lib/sqlite3/test/regression.py Modules/_sqlite/connection.c

[victor.stinner]

Author: victor.stinner
Date: Sun Mar 21 21:29:20 2010
New Revision: 79236

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


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/sqlite3/test/regression.py
   python/branches/release31-maint/Modules/_sqlite/connection.c

Modified: python/branches/release31-maint/Lib/sqlite3/test/regression.py
==============================================================================
--- python/branches/release31-maint/Lib/sqlite3/test/regression.py	(original)
+++ python/branches/release31-maint/Lib/sqlite3/test/regression.py	Sun Mar 21 21:29:20 2010
@@ -176,6 +176,13 @@
         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,))

Modified: python/branches/release31-maint/Modules/_sqlite/connection.c
==============================================================================
--- python/branches/release31-maint/Modules/_sqlite/connection.c	(original)
+++ python/branches/release31-maint/Modules/_sqlite/connection.c	Sun Mar 21 21:29:20 2010
@@ -979,6 +979,12 @@
         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) {