diff options
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_sqlite/connection.c | 11 | ||||
| -rw-r--r-- | Modules/_sqlite/module.c | 5 |
2 files changed, 13 insertions, 3 deletions
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index 703af15fa9..d491688252 100644 --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -822,6 +822,7 @@ static int connection_set_isolation_level(Connection* self, PyObject* isolation_ { PyObject* res; PyObject* begin_statement; + char* begin_statement_str; Py_XDECREF(self->isolation_level); @@ -854,12 +855,18 @@ static int connection_set_isolation_level(Connection* self, PyObject* isolation_ 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 index 606454ca1f..bfaf730e0c 100644 --- a/Modules/_sqlite/module.c +++ b/Modules/_sqlite/module.c @@ -128,12 +128,15 @@ static PyObject* module_register_adapter(PyObject* self, PyObject* args, PyObjec { PyTypeObject* type; PyObject* caster; + int rc; if (!PyArg_ParseTuple(args, "OO", &type, &caster)) { return NULL; } - microprotocols_add(type, (PyObject*)&SQLitePrepareProtocolType, caster); + rc = microprotocols_add(type, (PyObject*)&SQLitePrepareProtocolType, caster); + if (rc == -1) + return NULL; Py_INCREF(Py_None); return Py_None; |