Skip to content

[3.7] bpo-26558: Fix Py_FatalError() with GIL released (GH-10267) #10269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miss-islington merged 1 commit into from
Oct 31, 2018
Merged

[3.7] bpo-26558: Fix Py_FatalError() with GIL released (GH-10267) #10269

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 25 additions & 10 deletions Python/pylifecycle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2015,12 +2015,6 @@ _Py_FatalError_PrintExc(int fd)
PyObject *exception, *v, *tb;
int has_tb;

if (PyThreadState_GET() == NULL) {
/* The GIL is released: trying to acquire it is likely to deadlock,
just give up. */
return 0;
}

PyErr_Fetch(&exception, &v, &tb);
if (exception == NULL) {
/* No current exception */
Expand Down Expand Up @@ -2125,9 +2119,30 @@ fatal_error(const char *prefix, const char *msg, int status)
fputs("\n", stderr);
fflush(stderr); /* it helps in Windows debug build */

/* Print the exception (if an exception is set) with its traceback,
* or display the current Python stack. */
if (!_Py_FatalError_PrintExc(fd)) {
/* Check if the current thread has a Python thread state
and holds the GIL */
PyThreadState *tss_tstate = PyGILState_GetThisThreadState();
if (tss_tstate != NULL) {
PyThreadState *tstate = PyThreadState_GET();
if (tss_tstate != tstate) {
/* The Python thread does not hold the GIL */
tss_tstate = NULL;
}
}
else {
/* Py_FatalError() has been called from a C thread
which has no Python thread state. */
}
int has_tstate_and_gil = (tss_tstate != NULL);

if (has_tstate_and_gil) {
/* If an exception is set, print the exception with its traceback */
if (!_Py_FatalError_PrintExc(fd)) {
/* No exception is set, or an exception is set without traceback */
_Py_FatalError_DumpTracebacks(fd);
}
}
else {
_Py_FatalError_DumpTracebacks(fd);
}

Expand All @@ -2138,7 +2153,7 @@ fatal_error(const char *prefix, const char *msg, int status)
_PyFaulthandler_Fini();

/* Check if the current Python thread hold the GIL */
if (PyThreadState_GET() != NULL) {
if (has_tstate_and_gil) {
/* Flush sys.stdout and sys.stderr */
flush_std_files();
}
Expand Down