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

gh-131401: fix data race in _PyErr_Restore (#131406)

Browse source
This commit is contained in:
Kumar Aditya 2025-03-19 14:35:47 +05:30 • committed by GitHub
parent 61b4b2c57c
commit 74b87515a7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Python/errors.c
View file

@ -73,7 +73,11 @@ _PyErr_Restore(PyThreadState *tstate, PyObject *type, PyObject *value,
assert(PyExceptionClass_Check(type));
if (value != NULL && type == (PyObject *)Py_TYPE(value)) {
/* Already normalized */
assert(((PyBaseExceptionObject *)value)->traceback != Py_None);
#ifdef Py_DEBUG
PyObject *tb = PyException_GetTraceback(value);
assert(tb != Py_None);
Py_XDECREF(tb);
#endif
}
else {
PyObject *exc = _PyErr_CreateException(type, value);
@ -86,22 +90,15 @@ _PyErr_Restore(PyThreadState *tstate, PyObject *type, PyObject *value,
value = exc;
}
assert(PyExceptionInstance_Check(value));
if (traceback != NULL && !PyTraceBack_Check(traceback)) {
if (traceback == Py_None) {
Py_DECREF(Py_None);
traceback = NULL;
}
else {
PyErr_SetString(PyExc_TypeError, "traceback must be a Traceback or None");
Py_XDECREF(value);
if (traceback != NULL) {
if (PyException_SetTraceback(value, traceback) < 0) {
Py_DECREF(traceback);
Py_DECREF(value);
Py_DECREF(type);
Py_XDECREF(traceback);
return;
}
Py_DECREF(traceback);
}
PyObject *old_traceback = ((PyBaseExceptionObject *)value)->traceback;
((PyBaseExceptionObject *)value)->traceback = traceback;
Py_XDECREF(old_traceback);
_PyErr_SetRaisedException(tstate, value);
Py_DECREF(type);
}