greg/cpython
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

bpo-41991: Remove _PyObject_HasAttrId (GH-22629)

Browse Source 
It can silence arbitrary exceptions.
This commit is contained in:
Serhiy Storchaka
2020-10-10 22:23:42 +03:00
committed by GitHub
parent 02a1603f91
commit 98c4433a81
5 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Python/pythonrun.c
View File

@@ -770,7 +770,7 @@ static void
print_exception(PyObject *f, PyObject *value)
{
int err = 0;
PyObject *type, *tb;
PyObject *type, *tb, *tmp;
_Py_IDENTIFIER(print_file_and_line);
if (!PyExceptionInstance_Check(value)) {
@@ -789,10 +789,12 @@ print_exception(PyObject *f, PyObject *value)
if (tb && tb != Py_None)
err = PyTraceBack_Print(tb, f);
if (err == 0 &&
_PyObject_HasAttrId(value, &PyId_print_file_and_line))
(err = _PyObject_LookupAttrId(value, &PyId_print_file_and_line, &tmp)) > 0)
{
PyObject *message, *filename, *text;
Py_ssize_t lineno, offset;
err = 0;
Py_DECREF(tmp);
if (!parse_syntax_error(value, &message, &filename,
&lineno, &offset, &text))
PyErr_Clear();