diff options
author | Georg Brandl <georg@python.org> | 2008-07-16 22:33:18 +0000 |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2008-07-16 22:33:18 +0000 |
commit | a24869ada70ab30f4e08d71cdefda644cc40c6b0 (patch) | |
tree | 74fee137cbc427d59b168e931ec8e66ec4671cc0 /Modules/_sqlite/connection.c | |
parent | 4ed9be733b58712e3e91dafa5ab13cc0a6d99702 (diff) | |
download | cpython-git-a24869ada70ab30f4e08d71cdefda644cc40c6b0.tar.gz |
#3312: fix two sqlite3 crashes.
Diffstat (limited to 'Modules/_sqlite/connection.c')
-rw-r--r-- | Modules/_sqlite/connection.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index 2071c33212..46774c12c2 100644 --- 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); } |