diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2016-03-16 23:19:15 +0100 |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2016-03-16 23:19:15 +0100 |
commit | 17d6e8e768462596d5a1aef0bd4206e7eda161c8 (patch) | |
tree | 81eaa1338b04d209b6277bf6e0de59450d68d6ff /Python | |
parent | f170005bfdc09173b855048302a650fa3ef7d16f (diff) | |
download | cpython-17d6e8e768462596d5a1aef0bd4206e7eda161c8.tar.gz |
Py_FatalError: disable faulthandler earlier
Issue #26563: Py_FatalError: disable faulthandler before trying to flush
sys.stdout and sys.stderr.
Diffstat (limited to 'Python')
-rw-r--r-- | Python/pylifecycle.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 41528cdfe3..502a1e6ac2 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -1371,17 +1371,17 @@ Py_FatalError(const char *msg) if (!_Py_FatalError_PrintExc(fd)) _Py_FatalError_DumpTracebacks(fd); + /* The main purpose of faulthandler is to display the traceback. We already + * did our best to display it. So faulthandler can now be disabled. + * (Don't trigger it on abort().) */ + _PyFaulthandler_Fini(); + /* Check if the current Python thread hold the GIL */ if (PyThreadState_GET() != NULL) { /* Flush sys.stdout and sys.stderr */ flush_std_files(); } - /* The main purpose of faulthandler is to display the traceback. We already - * did our best to display it. So faulthandler can now be disabled. - * (Don't trigger it on abort().) */ - _PyFaulthandler_Fini(); - #ifdef MS_WINDOWS len = strlen(msg); |