commit f80527679b64f9c14c555db6843fac659b1e3aeb
author Gerhard Häring <gh@ghaering.de> Wed Oct 08 08:45:16 2008 +0000
committer Gerhard Häring <gh@ghaering.de> Wed Oct 08 08:45:16 2008 +0000
tree c7c81ea6bbe6781bda91e0c55f7c230779407bd4
parent bab0f2ff662fa5e94115d2e902d3a694d61ad7f9

Issue #4046: Backport of issue #3312's patch: fixes two crashes in the sqlite3
module.

Modules/_sqlite/connection.c

diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index 703af15..d491688 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -822,6 +822,7 @@
 {
     PyObject* res;
     PyObject* begin_statement;
+    char* begin_statement_str;
 
     Py_XDECREF(self->isolation_level);
 
@@ -854,12 +855,18 @@
             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);
     }