mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-19 17:25:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Close #20500: Don't trigger PyObject_Str assertion at shutdown

Browse source
This commit is contained in:
Nick Coghlan 2014-02-09 10:43:21 +10:00
parent c9d1a6b85e
commit d979e4335d
4 changed files with 28 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Python/pythonrun.c
View file

@ -1792,6 +1792,11 @@ handle_system_exit(void)
exitcode = (int)PyLong_AsLong(value);
else {
PyObject *sys_stderr = _PySys_GetObjectId(&PyId_stderr);
/* We clear the exception here to avoid triggering the assertion
* in PyObject_Str that ensures it won't silently lose exception
* details.
*/
PyErr_Clear();
if (sys_stderr != NULL && sys_stderr != Py_None) {
PyFile_WriteObject(value, sys_stderr, Py_PRINT_RAW);
} else {