https://github.com/python/cpython/commit/74b87515a72a2b7a6e601423f4b3b19b6566377f
commit: 74b87515a72a2b7a6e601423f4b3b19b6566377f
branch: main
author: Kumar Aditya <[email protected]>
committer: kumaraditya303 <[email protected]>
date: 2025-03-19T14:35:47+05:30
summary:
gh-131401: fix data race in `_PyErr_Restore` (#131406)
files:
M Python/errors.c
diff --git a/Python/errors.c b/Python/errors.c
index 04b0be089f9d57..306fb073bc2296 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -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);
}
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
