Skip to content

gh-111178: fix UBSan failures in Python/context.c #128242

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
encukou merged 4 commits into from
Jan 8, 2025
Merged

gh-111178: fix UBSan failures in Python/context.c #128242

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d9b1042
fix UBSan failures for `PyContext`
picnixz Dec 23, 2024
c9f8a06
fix UBSan failures for `PyContextVar`
picnixz Dec 23, 2024
e63ca99
fix UBSan failures for `PyContextToken`
picnixz Dec 23, 2024
637335d
fix UBSan failures for `_PyContextTokenMissing`
picnixz Dec 23, 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
Prev Previous commit
Next Next commit
fix UBSan failures for PyContextToken
  • Loading branch information
@picnixz
picnixz committed Dec 23, 2024
commit e63ca99233f534018077b2f0d4002a83de921b9b
44 changes: 26 additions & 18 deletions Python/context.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,12 +909,7 @@ class _contextvars.ContextVar "PyContextVar *" "&PyContextVar_Type"
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=445da935fa8883c3]*/


static inline PyContextVar *
_PyContextVar_CAST(PyObject *op)
{
assert(PyObject_TypeCheck(op, &PyContextVar_Type));
return (PyContextVar *)op;
}
#define _PyContextVar_CAST(op) ((PyContextVar *)(op))


static PyObject *
Expand Down Expand Up @@ -1141,6 +1136,14 @@ class _contextvars.Token "PyContextToken *" "&PyContextToken_Type"
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=338a5e2db13d3f5b]*/


static inline PyContextToken *
_PyContextToken_CAST(PyObject *op)
{
assert(PyObject_TypeCheck(op, &PyContextToken_Type));
return (PyContextToken *)op;
}


static PyObject *
token_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{
Expand All @@ -1150,34 +1153,37 @@ token_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
}

static int
token_tp_clear(PyContextToken *self)
token_tp_clear(PyObject *op)
{
PyContextToken *self = _PyContextToken_CAST(op);
Py_CLEAR(self->tok_ctx);
Py_CLEAR(self->tok_var);
Py_CLEAR(self->tok_oldval);
return 0;
}

static int
token_tp_traverse(PyContextToken *self, visitproc visit, void *arg)
token_tp_traverse(PyObject *op, visitproc visit, void *arg)
{
PyContextToken *self = _PyContextToken_CAST(op);
Py_VISIT(self->tok_ctx);
Py_VISIT(self->tok_var);
Py_VISIT(self->tok_oldval);
return 0;
}

static void
token_tp_dealloc(PyContextToken *self)
token_tp_dealloc(PyObject *self)
{
PyObject_GC_UnTrack(self);
(void)token_tp_clear(self);
Py_TYPE(self)->tp_free(self);
}

static PyObject *
token_tp_repr(PyContextToken *self)
token_tp_repr(PyObject *op)
{
PyContextToken *self = _PyContextToken_CAST(op);
PyUnicodeWriter *writer = PyUnicodeWriter_Create(0);
if (writer == NULL) {
return NULL;
Expand Down Expand Up @@ -1207,14 +1213,16 @@ token_tp_repr(PyContextToken *self)
}

static PyObject *
token_get_var(PyContextToken *self, void *Py_UNUSED(ignored))
token_get_var(PyObject *op, void *Py_UNUSED(ignored))
{
PyContextToken *self = _PyContextToken_CAST(op);
return Py_NewRef(self->tok_var);;
}

static PyObject *
token_get_old_value(PyContextToken *self, void *Py_UNUSED(ignored))
token_get_old_value(PyObject *op, void *Py_UNUSED(ignored))
{
PyContextToken *self = _PyContextToken_CAST(op);
if (self->tok_oldval == NULL) {
return get_token_missing();
}
Expand All @@ -1223,8 +1231,8 @@ token_get_old_value(PyContextToken *self, void *Py_UNUSED(ignored))
}

static PyGetSetDef PyContextTokenType_getsetlist[] = {
{"var", (getter)token_get_var, NULL, NULL},
{"old_value", (getter)token_get_old_value, NULL, NULL},
{"var", token_get_var, NULL, NULL},
{"old_value", token_get_old_value, NULL, NULL},
{NULL}
};

Expand All @@ -1240,15 +1248,15 @@ PyTypeObject PyContextToken_Type = {
sizeof(PyContextToken),
.tp_methods = PyContextTokenType_methods,
.tp_getset = PyContextTokenType_getsetlist,
.tp_dealloc = (destructor)token_tp_dealloc,
.tp_dealloc = token_tp_dealloc,
.tp_getattro = PyObject_GenericGetAttr,
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,
.tp_traverse = (traverseproc)token_tp_traverse,
.tp_clear = (inquiry)token_tp_clear,
.tp_traverse = token_tp_traverse,
.tp_clear = token_tp_clear,
.tp_new = token_tp_new,
.tp_free = PyObject_GC_Del,
.tp_hash = PyObject_HashNotImplemented,
.tp_repr = (reprfunc)token_tp_repr,
.tp_repr = token_tp_repr,
};

static PyContextToken *
Expand Down