Skip to content

gh-117657: Fix some races in tracebacks #121748

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

Closed
Fidget-Spinner wants to merge 6 commits into from
Closed

gh-117657: Fix some races in tracebacks #121748

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6cb8897
Fix races in tracebacks
Fidget-Spinner Jul 14, 2024
5bc855c
use atomics in new_reference
Fidget-Spinner Jul 14, 2024
da8415d
Add more atomics
Fidget-Spinner Jul 14, 2024
ef99cb9
Update Include/cpython/pyatomic_msc.h
Fidget-Spinner Jul 22, 2024
951a34d
revert atomics
Fidget-Spinner Jul 24, 2024
6e0e176
Use argumentclinic
Fidget-Spinner Jul 24, 2024
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
Next Next commit
Fix races in tracebacks
  • Loading branch information
@Fidget-Spinner
Fidget-Spinner committed Jul 14, 2024
commit 6cb88977e006ec426daa823921739e12620ac64c
24 changes: 22 additions & 2 deletions Objects/exceptions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,16 +308,26 @@ BaseException_set_args(PyBaseExceptionObject *self, PyObject *val, void *Py_UNUS
}

static PyObject *
BaseException_get_tb(PyBaseExceptionObject *self, void *Py_UNUSED(ignored))
BaseException_get_tb_lock_held(PyBaseExceptionObject *self, void *Py_UNUSED(ignored))
{
if (self->traceback == NULL) {
Py_RETURN_NONE;
}
return Py_NewRef(self->traceback);
}

static PyObject *
BaseException_get_tb(PyBaseExceptionObject *self, void *Py_UNUSED(ignored))
Comment thread
Fidget-Spinner marked this conversation as resolved.
Outdated
{
PyObject *res;
Py_BEGIN_CRITICAL_SECTION(self);
res = BaseException_get_tb_lock_held(self, NULL);
Py_END_CRITICAL_SECTION();
return res;
}

static int
BaseException_set_tb(PyBaseExceptionObject *self, PyObject *tb, void *Py_UNUSED(ignored))
BaseException_set_tb_lock_held(PyBaseExceptionObject *self, PyObject *tb, void *Py_UNUSED(ignored))
{
if (tb == NULL) {
PyErr_SetString(PyExc_TypeError, "__traceback__ may not be deleted");
Expand All @@ -337,6 +347,16 @@ BaseException_set_tb(PyBaseExceptionObject *self, PyObject *tb, void *Py_UNUSED(
return 0;
}

static int
BaseException_set_tb(PyBaseExceptionObject *self, PyObject *tb, void *Py_UNUSED(ignored))
{
int res;
Py_BEGIN_CRITICAL_SECTION(self);
res = BaseException_set_tb_lock_held(self, tb, NULL);
Py_END_CRITICAL_SECTION();
return res;
}

static PyObject *
BaseException_get_context(PyObject *self, void *Py_UNUSED(ignored))
{
Expand Down