mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-31746: Prevent segfaults when sqlite3.Connection is uninitialised (GH-27431)

Browse source
This commit is contained in:
Erlend Egeberg Aasland 2021-07-29 21:45:32 +02:00 • committed by GitHub
parent 8182c8329c
commit 7e311e496b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Modules/_sqlite/connection.c
View file

@ -111,8 +111,6 @@ pysqlite_connection_init_impl(pysqlite_Connection *self,
const char *database = PyBytes_AsString(database_obj);
self->initialized = 1;
self->begin_statement = NULL;
Py_CLEAR(self->statement_cache);
@ -147,7 +145,7 @@ pysqlite_connection_init_impl(pysqlite_Connection *self,
Py_INCREF(isolation_level);
}
Py_CLEAR(self->isolation_level);
if (pysqlite_connection_set_isolation_level(self, isolation_level, NULL) < 0) {
if (pysqlite_connection_set_isolation_level(self, isolation_level, NULL) != 0) {
Py_DECREF(isolation_level);
return -1;
}
@ -195,6 +193,8 @@ pysqlite_connection_init_impl(pysqlite_Connection *self,
return -1;
}
self->initialized = 1;
return 0;
}
@ -371,6 +371,13 @@ pysqlite_connection_close_impl(pysqlite_Connection *self)
return NULL;
}
if (!self->initialized) {
pysqlite_state *state = pysqlite_get_state(NULL);
PyErr_SetString(state->ProgrammingError,
"Base Connection.__init__ not called.");
return NULL;
}
pysqlite_do_all_statements(self, ACTION_FINALIZE, 1);
connection_close(self);
@ -1258,6 +1265,9 @@ int pysqlite_check_thread(pysqlite_Connection* self)
static PyObject* pysqlite_connection_get_isolation_level(pysqlite_Connection* self, void* unused)
{
if (!pysqlite_check_connection(self)) {
return NULL;
}
return Py_NewRef(self->isolation_level);
}
@ -1289,11 +1299,17 @@ pysqlite_connection_set_isolation_level(pysqlite_Connection* self, PyObject* iso
return -1;
}
if (isolation_level == Py_None) {
PyObject *res = pysqlite_connection_commit(self, NULL);
if (!res) {
return -1;
/* We might get called during connection init, so we cannot use
* pysqlite_connection_commit() here. */
if (self->db && !sqlite3_get_autocommit(self->db)) {
int rc;
Py_BEGIN_ALLOW_THREADS
rc = sqlite3_exec(self->db, "COMMIT", NULL, NULL, NULL);
Py_END_ALLOW_THREADS
if (rc != SQLITE_OK) {
return _pysqlite_seterror(self->db);
}
}
Py_DECREF(res);
self->begin_statement = NULL;
} else {