mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-10 00:43:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

Issue #18664, #18408: Rewrite PyErr_WriteUnraisable() to handle errors

Browse source 
* Catch PyFile_WriteString() and PyFile_WriteObject() errors
 * Clear the current exception on _PyObject_GetAttrId() failure
 * Use PyUnicode_CompareWithASCIIString() and PyFile_WriteObject() instead of
   _PyUnicode_AsString() and strcmp() to avoid Unicode encoding error. stderr
   has a more tolerant error handler than utf-8/strict.
This commit is contained in:
Victor Stinner 2013-08-26 14:04:10 +02:00
parent e51321020c
commit c82bfd871f
1 changed files with 65 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

80
Python/errors.c
View file

@ -825,18 +825,30 @@ PyErr_WriteUnraisable(PyObject *obj)
{ {
_Py_IDENTIFIER(__module__); _Py_IDENTIFIER(__module__);
PyObject *f, *t, *v, *tb; PyObject *f, *t, *v, *tb;
PyErr_Fetch(&t, &v, &tb); PyObject *moduleName = NULL;
f = PySys_GetObject("stderr");
if (f != NULL && f != Py_None) {
if (obj) {
PyFile_WriteString("Exception ignored in: ", f);
PyFile_WriteObject(obj, f, 0);
PyFile_WriteString("\n", f);
}
PyTraceBack_Print(tb, f);
if (t) {
PyObject* moduleName;
char* className; char* className;
PyErr_Fetch(&t, &v, &tb);
f = PySys_GetObject("stderr");
if (f == NULL || f == Py_None)
goto done;
if (obj) {
if (PyFile_WriteString("Exception ignored in: ", f) < 0)
goto done;
if (PyFile_WriteObject(obj, f, 0) < 0)
goto done;
if (PyFile_WriteString("\n", f) < 0)
goto done;
}
if (PyTraceBack_Print(tb, f) < 0)
goto done;
if (!t)
goto done;
assert(PyExceptionClass_Check(t)); assert(PyExceptionClass_Check(t));
className = PyExceptionClass_Name(t); className = PyExceptionClass_Name(t);
if (className != NULL) { if (className != NULL) {
@ -846,33 +858,43 @@ PyErr_WriteUnraisable(PyObject *obj)
} }
moduleName = _PyObject_GetAttrId(t, &PyId___module__); moduleName = _PyObject_GetAttrId(t, &PyId___module__);
if (moduleName == NULL) if (moduleName == NULL) {
PyFile_WriteString("<unknown>", f); PyErr_Clear();
if (PyFile_WriteString("<unknown>", f) < 0)
goto done;
}
else { else {
char* modstr = _PyUnicode_AsString(moduleName); if (PyUnicode_CompareWithASCIIString(moduleName, "builtins") != 0) {
if (modstr && if (PyFile_WriteObject(moduleName, f, Py_PRINT_RAW) < 0)
strcmp(modstr, "builtins") != 0) goto done;
{ if (PyFile_WriteString(".", f) < 0)
PyFile_WriteString(modstr, f); goto done;
PyFile_WriteString(".", f);
} }
} }
if (className == NULL) if (className == NULL) {
PyFile_WriteString("<unknown>", f); if (PyFile_WriteString("<unknown>", f) < 0)
else goto done;
PyFile_WriteString(className, f); }
else {
if (PyFile_WriteString(className, f) < 0)
goto done;
}
if (v && v != Py_None) { if (v && v != Py_None) {
PyFile_WriteString(": ", f); if (PyFile_WriteString(": ", f) < 0)
PyFile_WriteObject(v, f, Py_PRINT_RAW); goto done;
if (PyFile_WriteObject(v, f, Py_PRINT_RAW) < 0)
goto done;
} }
PyFile_WriteString("\n", f); if (PyFile_WriteString("\n", f) < 0)
goto done;
done:
Py_XDECREF(moduleName); Py_XDECREF(moduleName);
}
PyErr_Clear(); /* Just in case */
}
Py_XDECREF(t); Py_XDECREF(t);
Py_XDECREF(v); Py_XDECREF(v);
Py_XDECREF(tb); Py_XDECREF(tb);
PyErr_Clear(); /* Just in case */
} }
extern PyObject *PyModule_GetWarningsModule(void); extern PyObject *PyModule_GetWarningsModule(void);