#3312: fix two sqlite3 crashes.

georg.brandl · georg.brandl · commit d7146ff578fe · 2008-07-16T22:33:18.000Z
git-svn-id: http://svn.python.org/projects/python/trunk@65040 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Lib/sqlite3/test/regression.py b/Lib/sqlite3/test/regression.py
@@ -153,6 +153,20 @@ def CheckTypeMapUsage(self):
         con.execute("insert into foo(bar) values (5)")
         con.execute(SELECT)
 
+    def CheckRegisterAdapter(self):
+        """
+        See issue 3312.
+        """
+        self.assertRaises(TypeError, sqlite.register_adapter, {}, None)
+
+    def CheckSetIsolationLevel(self):
+        """
+        See issue 3312.
+        """
+        con = sqlite.connect(":memory:")
+        self.assertRaises(UnicodeEncodeError, setattr, con,
+                          "isolation_level", u"\xe9")
+
 
 def suite():
     regression_suite = unittest.makeSuite(RegressionTests, "Check")
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -63,6 +63,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #3312: Fix two crashes in sqlite3.
+
 - Issue #1608818: Fix misbehavior in os.listdir() if readdir() fails.
 
 - Issue #3125: Remove copy_reg in multiprocessing and replace it with
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
@@ -940,6 +940,7 @@ static int pysqlite_connection_set_isolation_level(pysqlite_Connection* self, Py
 {
     PyObject* res;
     PyObject* begin_statement;
+    char* begin_statement_str;
 
     Py_XDECREF(self->isolation_level);
 
@@ -972,12 +973,18 @@ static int pysqlite_connection_set_isolation_level(pysqlite_Connection* self, Py
             return -1;
         }
 
-        self->begin_statement = PyMem_Malloc(PyString_Size(begin_statement) + 2);
+        begin_statement_str = PyString_AsString(begin_statement);
+        if (!begin_statement_str) {
+            Py_DECREF(begin_statement);
+            return -1;
+        }
+        self->begin_statement = PyMem_Malloc(strlen(begin_statement_str) + 2);
         if (!self->begin_statement) {
+            Py_DECREF(begin_statement);
             return -1;
         }
 
-        strcpy(self->begin_statement, PyString_AsString(begin_statement));
+        strcpy(self->begin_statement, begin_statement_str);
         Py_DECREF(begin_statement);
     }
 
diff --git a/Modules/_sqlite/module.c b/Modules/_sqlite/module.c
@@ -147,6 +147,7 @@ static PyObject* module_register_adapter(PyObject* self, PyObject* args)
 {
     PyTypeObject* type;
     PyObject* caster;
+    int rc;
 
     if (!PyArg_ParseTuple(args, "OO", &type, &caster)) {
         return NULL;
@@ -159,7 +160,9 @@ static PyObject* module_register_adapter(PyObject* self, PyObject* args)
         pysqlite_BaseTypeAdapted = 1;
     }
 
-    microprotocols_add(type, (PyObject*)&pysqlite_PrepareProtocolType, caster);
+    rc = microprotocols_add(type, (PyObject*)&pysqlite_PrepareProtocolType, caster);
+    if (rc == -1)
+        return NULL;
 
     Py_INCREF(Py_None);
     return Py_None;

Original file line number	Diff line number	Diff line change
`@@ -940,6 +940,7 @@ static int pysqlite_connection_set_isolation_level(pysqlite_Connection* self, Py`
`940`	`940`	`{`
`941`	`941`	`PyObject* res;`
`942`	`942`	`PyObject* begin_statement;`
	`943`	`+ char* begin_statement_str;`
`943`	`944`
`944`	`945`	`Py_XDECREF(self->isolation_level);`
`945`	`946`
`@@ -972,12 +973,18 @@ static int pysqlite_connection_set_isolation_level(pysqlite_Connection* self, Py`
`972`	`973`	`return -1;`
`973`	`974`	`}`
`974`	`975`
`975`		`- self->begin_statement = PyMem_Malloc(PyString_Size(begin_statement) + 2);`
	`976`	`+ begin_statement_str = PyString_AsString(begin_statement);`
	`977`	`+ if (!begin_statement_str) {`
	`978`	`+ Py_DECREF(begin_statement);`
	`979`	`+ return -1;`
	`980`	`+ }`
	`981`	`+ self->begin_statement = PyMem_Malloc(strlen(begin_statement_str) + 2);`
`976`	`982`	`if (!self->begin_statement) {`
	`983`	`+ Py_DECREF(begin_statement);`
`977`	`984`	`return -1;`
`978`	`985`	`}`
`979`	`986`
`980`		`- strcpy(self->begin_statement, PyString_AsString(begin_statement));`
	`987`	`+ strcpy(self->begin_statement, begin_statement_str);`
`981`	`988`	`Py_DECREF(begin_statement);`
`982`	`989`	`}`
`983`	`990`