Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-39877: take_gil() checks tstate_must_exit() twice (GH-18890) 

take_gil() now also checks tstate_must_exit() after acquiring
the GIL: exit the thread if Py_Finalize() has been called.
This commit is contained in:
Victor Stinner 2020-03-09 23:10:53 +01:00 committed by GitHub
parent b7e9525f9c
commit 9229eeee10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Python/ceval_gil.h
View File

@ -213,8 +213,13 @@ take_gil(PyThreadState *tstate)
assert(tstate != NULL);
/* Check if we should make a quick exit. */
if (tstate_must_exit(tstate)) {
/* bpo-39877: If Py_Finalize() has been called and tstate is not the
thread which called Py_Finalize(), exit immediately the thread.
This code path can be reached by a daemon thread after Py_Finalize()
completes. In this case, tstate is a dangling pointer: points to
PyThreadState freed memory. */
PyThread_exit_thread();
}
@ -282,6 +287,18 @@ _ready:
MUTEX_UNLOCK(gil->mutex);
if (tstate_must_exit(tstate)) {
/* bpo-36475: If Py_Finalize() has been called and tstate is not
the thread which called Py_Finalize(), exit immediately the
thread.
This code path can be reached by a daemon thread which was waiting
in take_gil() while the main thread called
wait_for_thread_shutdown() from Py_Finalize(). */
drop_gil(ceval, tstate);
PyThread_exit_thread();
}
errno = err;
}