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

pablogsal · web-flow · commit 6e3b7cf3af3e · 2021-06-05T23:41:11.000+01:00
diff --git 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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -825,7 +825,12 @@ static void _pysqlite_drop_unused_cursor_references(pysqlite_Connection* self)`
`825`	`825`
`826`	`826`	`static void _destructor(void* args)`
`827`	`827`	`{`
	`828`	`+ // This function may be called without the GIL held, so we need to ensure`
	`829`	`+ // that we destroy 'args' with the GIL`
	`830`	`+ PyGILState_STATE gstate;`
	`831`	`+ gstate = PyGILState_Ensure();`
`828`	`832`	`Py_DECREF((PyObject*)args);`
	`833`	`+ PyGILState_Release(gstate);`
`829`	`834`	`}`
`830`	`835`
`831`	`836`	`/*[clinic input]`
Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,9 @@ stmt_dealloc(pysqlite_Statement *self)`
`404`	`404`	`PyObject_ClearWeakRefs((PyObject*)self);`
`405`	`405`	`}`
`406`	`406`	`if (self->st) {`
	`407`	`+ Py_BEGIN_ALLOW_THREADS`
`407`	`408`	`sqlite3_finalize(self->st);`
	`409`	`+ Py_END_ALLOW_THREADS`
`408`	`410`	`self->st = 0;`
`409`	`411`	`}`
`410`	`412`	`tp->tp_clear((PyObject *)self);`