Skip to content

gh-102493: fix normalization in PyErr_SetObject #102502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Yhg1s merged 8 commits into from
Mar 7, 2023
Merged

gh-102493: fix normalization in PyErr_SetObject #102502

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
077747d
add test for PyErr_SetObject
iritkatriel Mar 7, 2023
feef425
fix normalization in PyErr_SetObject
iritkatriel Mar 7, 2023
c211d86
add news
iritkatriel Mar 7, 2023
cea7ff9
rename news file
iritkatriel Mar 7, 2023
61c6615
assert not null
iritkatriel Mar 7, 2023
a9094f9
skip issubclass when not an exception
iritkatriel Mar 7, 2023
6d7bccd
whitespace
iritkatriel Mar 7, 2023
fd01812
fix refleak when is_subclass fails
iritkatriel Mar 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix normalization in PyErr_SetObject
  • Loading branch information
@iritkatriel
iritkatriel committed Mar 7, 2023
commit feef425173732849be82809e8d5f62eda74e9919
11 changes: 9 additions & 2 deletions Python/errors.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,14 @@ _PyErr_SetObject(PyThreadState *tstate, PyObject *exception, PyObject *value)
}
Py_XINCREF(value);
/* Normalize the exception */
if (value == NULL || (PyObject *)Py_TYPE(value) != exception) {
int is_subclass = 0;
if (value != NULL) {
is_subclass = PyObject_IsSubclass((PyObject*)Py_TYPE(value), exception);
Comment thread
iritkatriel marked this conversation as resolved.
Outdated
Comment thread
gvanrossum marked this conversation as resolved.
Outdated
if (is_subclass < 0) {
return;
Comment thread
iritkatriel marked this conversation as resolved.
}
}
if (value == NULL || !is_subclass) {
/* We must normalize the value right now */
PyObject *fixed_value;

Expand Down Expand Up @@ -208,7 +215,7 @@ _PyErr_SetObject(PyThreadState *tstate, PyObject *exception, PyObject *value)
}
if (value != NULL && PyExceptionInstance_Check(value))
tb = PyException_GetTraceback(value);
_PyErr_Restore(tstate, Py_XNewRef(exception), value, tb);
_PyErr_Restore(tstate, Py_NewRef(Py_TYPE(value)), value, tb);
Comment thread
iritkatriel marked this conversation as resolved.
}

void
Expand Down