[Python-checkins] bpo-44304: Ensure the sqlite3 destructor callback is always called with the GIL held (GH-26551)

[pablogsal]

https://github.com/python/cpython/commit/6e3b7cf3af3ed7758b2c2193c1d393feb8ab8f72
commit: 6e3b7cf3af3ed7758b2c2193c1d393feb8ab8f72
branch: main
author: Pablo Galindo <Pablogsal at gmail.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-06-05T23:41:11+01:00
summary:

bpo-44304: Ensure the sqlite3 destructor callback is always called with the GIL held (GH-26551)

files:
M Modules/_sqlite/connection.c
M Modules/_sqlite/statement.c

diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index c2f3bc0f20125..fbee1b7ce52a2 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -825,7 +825,12 @@ static void _pysqlite_drop_unused_cursor_references(pysqlite_Connection* self)
 
 static void _destructor(void* args)
 {
+    // This function may be called without the GIL held, so we need to ensure
+    // that we destroy 'args' with the GIL
+    PyGILState_STATE gstate;
+    gstate = PyGILState_Ensure();
     Py_DECREF((PyObject*)args);
+    PyGILState_Release(gstate);
 }
 
 /*[clinic input]
diff --git a/Modules/_sqlite/statement.c b/Modules/_sqlite/statement.c
index c9dd882945328..f12ef67d261c7 100644
--- a/Modules/_sqlite/statement.c
+++ b/Modules/_sqlite/statement.c
@@ -404,7 +404,9 @@ stmt_dealloc(pysqlite_Statement *self)
         PyObject_ClearWeakRefs((PyObject*)self);
     }
     if (self->st) {
+        Py_BEGIN_ALLOW_THREADS
         sqlite3_finalize(self->st);
+        Py_END_ALLOW_THREADS
         self->st = 0;
     }
     tp->tp_clear((PyObject *)self);