diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2020-10-10 22:23:42 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-10 22:23:42 +0300 |
| commit | 98c4433a81a4cd88c7438adbee1f2aa486188ca3 (patch) | |
| tree | 68dd030d113eb842692d4f50475992a110fb7154 /Python/errors.c | |
| parent | 02a1603f918b9862e164e4fd050c505b16bc9f57 (diff) | |
| download | cpython-git-98c4433a81a4cd88c7438adbee1f2aa486188ca3.tar.gz | |
bpo-41991: Remove _PyObject_HasAttrId (GH-22629)
It can silence arbitrary exceptions.
Diffstat (limited to 'Python/errors.c')
| -rw-r--r-- | Python/errors.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/Python/errors.c b/Python/errors.c index 720f18bc22..02cf47992b 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -1593,9 +1593,18 @@ PyErr_SyntaxLocationObject(PyObject *filename, int lineno, int col_offset) } Py_DECREF(tmp); } + else { + _PyErr_Clear(tstate); + } } if (exc != PyExc_SyntaxError) { - if (!_PyObject_HasAttrId(v, &PyId_msg)) { + if (_PyObject_LookupAttrId(v, &PyId_msg, &tmp) < 0) { + _PyErr_Clear(tstate); + } + else if (tmp) { + Py_DECREF(tmp); + } + else { tmp = PyObject_Str(v); if (tmp) { if (_PyObject_SetAttrId(v, &PyId_msg, tmp)) { @@ -1607,7 +1616,13 @@ PyErr_SyntaxLocationObject(PyObject *filename, int lineno, int col_offset) _PyErr_Clear(tstate); } } - if (!_PyObject_HasAttrId(v, &PyId_print_file_and_line)) { + if (_PyObject_LookupAttrId(v, &PyId_print_file_and_line, &tmp) < 0) { + _PyErr_Clear(tstate); + } + else if (tmp) { + Py_DECREF(tmp); + } + else { if (_PyObject_SetAttrId(v, &PyId_print_file_and_line, Py_None)) { _PyErr_Clear(tstate); |