Skip to content

gh-111178: fix UBSan failures in Objects/typevarobject.c #129800

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 8 commits into from
Feb 25, 2025
Merged

gh-111178: fix UBSan failures in Objects/typevarobject.c #129800

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5c8027f
fix UBSan failures for `typealiasobject`
picnixz Feb 6, 2025
a0733f5
fix UBSan failures for `paramspecobject`
picnixz Feb 6, 2025
5491487
fix UBSan failures for `typevarobject`
picnixz Feb 6, 2025
aea5605
fix UBSan failures for `typevartupleobject`
picnixz Feb 6, 2025
7ab32c5
fix UBSan failures for `paramspecattrobject`
picnixz Feb 6, 2025
7d5768a
use _PyCFunction_CAST macros
picnixz Feb 6, 2025
c8cbe9b
use macro for `constevaluatorobject` casts
picnixz Feb 6, 2025
71badf5
Merge remote-tracking branch 'upstream/main' into fix/ubsan/typevarob…
picnixz Feb 7, 2025
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 typevarobject
  • Loading branch information
@picnixz
picnixz committed Feb 6, 2025
commit 549148742dd749a4c5f2f5e2b1801cd5c71f0ccf
46 changes: 27 additions & 19 deletions Objects/typevarobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ typedef struct {
PyObject *module;
} typealiasobject;

#define typevarobject_CAST(op) ((typevarobject *)(op))
#define paramspecobject_CAST(op) ((paramspecobject *)(op))
#define typealiasobject_CAST(op) ((typealiasobject *)(op))

Expand Down Expand Up @@ -456,7 +457,7 @@ static void
typevar_dealloc(PyObject *self)
{
PyTypeObject *tp = Py_TYPE(self);
typevarobject *tv = (typevarobject *)self;
typevarobject *tv = typevarobject_CAST(self);

_PyObject_GC_UNTRACK(self);

Expand All @@ -478,7 +479,7 @@ static int
typevar_traverse(PyObject *self, visitproc visit, void *arg)
{
Py_VISIT(Py_TYPE(self));
typevarobject *tv = (typevarobject *)self;
typevarobject *tv = typevarobject_CAST(self);
Py_VISIT(tv->bound);
Py_VISIT(tv->evaluate_bound);
Py_VISIT(tv->constraints);
Expand All @@ -490,22 +491,23 @@ typevar_traverse(PyObject *self, visitproc visit, void *arg)
}

static int
typevar_clear(typevarobject *self)
typevar_clear(PyObject *op)
{
typevarobject *self = typevarobject_CAST(op);
Py_CLEAR(self->bound);
Py_CLEAR(self->evaluate_bound);
Py_CLEAR(self->constraints);
Py_CLEAR(self->evaluate_constraints);
Py_CLEAR(self->default_value);
Py_CLEAR(self->evaluate_default);
PyObject_ClearManagedDict((PyObject *)self);
PyObject_ClearManagedDict(op);
return 0;
}

static PyObject *
typevar_repr(PyObject *self)
{
typevarobject *tv = (typevarobject *)self;
typevarobject *tv = typevarobject_CAST(self);

if (tv->infer_variance) {
return Py_NewRef(tv->name);
Expand All @@ -524,8 +526,9 @@ static PyMemberDef typevar_members[] = {
};

static PyObject *
typevar_bound(typevarobject *self, void *Py_UNUSED(ignored))
typevar_bound(PyObject *op, void *Py_UNUSED(closure))
{
typevarobject *self = typevarobject_CAST(op);
if (self->bound != NULL) {
return Py_NewRef(self->bound);
}
Expand All @@ -538,8 +541,9 @@ typevar_bound(typevarobject *self, void *Py_UNUSED(ignored))
}

static PyObject *
typevar_default(typevarobject *self, void *unused)
typevar_default(PyObject *op, void *Py_UNUSED(closure))
{
typevarobject *self = typevarobject_CAST(op);
if (self->default_value != NULL) {
return Py_NewRef(self->default_value);
}
Expand All @@ -552,8 +556,9 @@ typevar_default(typevarobject *self, void *unused)
}

static PyObject *
typevar_constraints(typevarobject *self, void *Py_UNUSED(ignored))
typevar_constraints(PyObject *op, void *Py_UNUSED(closure))
{
typevarobject *self = typevarobject_CAST(op);
if (self->constraints != NULL) {
return Py_NewRef(self->constraints);
}
Expand All @@ -566,8 +571,9 @@ typevar_constraints(typevarobject *self, void *Py_UNUSED(ignored))
}

static PyObject *
typevar_evaluate_bound(typevarobject *self, void *Py_UNUSED(ignored))
typevar_evaluate_bound(PyObject *op, void *Py_UNUSED(closure))
{
typevarobject *self = typevarobject_CAST(op);
if (self->evaluate_bound != NULL) {
return Py_NewRef(self->evaluate_bound);
}
Expand All @@ -578,8 +584,9 @@ typevar_evaluate_bound(typevarobject *self, void *Py_UNUSED(ignored))
}

static PyObject *
typevar_evaluate_constraints(typevarobject *self, void *Py_UNUSED(ignored))
typevar_evaluate_constraints(PyObject *op, void *Py_UNUSED(closure))
{
typevarobject *self = typevarobject_CAST(op);
if (self->evaluate_constraints != NULL) {
return Py_NewRef(self->evaluate_constraints);
}
Expand All @@ -590,8 +597,9 @@ typevar_evaluate_constraints(typevarobject *self, void *Py_UNUSED(ignored))
}

static PyObject *
typevar_evaluate_default(typevarobject *self, void *Py_UNUSED(ignored))
typevar_evaluate_default(PyObject *op, void *Py_UNUSED(closure))
{
typevarobject *self = typevarobject_CAST(op);
if (self->evaluate_default != NULL) {
return Py_NewRef(self->evaluate_default);
}
Expand All @@ -602,12 +610,12 @@ typevar_evaluate_default(typevarobject *self, void *Py_UNUSED(ignored))
}

static PyGetSetDef typevar_getset[] = {
{"__bound__", (getter)typevar_bound, NULL, NULL, NULL},
{"__constraints__", (getter)typevar_constraints, NULL, NULL, NULL},
{"__default__", (getter)typevar_default, NULL, NULL, NULL},
{"evaluate_bound", (getter)typevar_evaluate_bound, NULL, NULL, NULL},
{"evaluate_constraints", (getter)typevar_evaluate_constraints, NULL, NULL, NULL},
{"evaluate_default", (getter)typevar_evaluate_default, NULL, NULL, NULL},
{"__bound__", typevar_bound, NULL, NULL, NULL},
{"__constraints__", typevar_constraints, NULL, NULL, NULL},
{"__default__", typevar_default, NULL, NULL, NULL},
{"evaluate_bound", typevar_evaluate_bound, NULL, NULL, NULL},
{"evaluate_constraints", typevar_evaluate_constraints, NULL, NULL, NULL},
{"evaluate_default", typevar_evaluate_default, NULL, NULL, NULL},
{0}
};

Expand Down Expand Up @@ -775,7 +783,7 @@ typevar_typing_prepare_subst_impl(typevarobject *self, PyObject *alias,
}
else if (i == args_len) {
// If the TypeVar has a default, use it.
PyObject *dflt = typevar_default(self, NULL);
PyObject *dflt = typevar_default((PyObject *)self, NULL);
if (dflt == NULL) {
Py_DECREF(params);
return NULL;
Expand Down Expand Up @@ -1809,7 +1817,7 @@ static PyObject *
get_type_param_default(PyThreadState *ts, PyObject *typeparam) {
// Does not modify refcount of existing objects.
if (Py_IS_TYPE(typeparam, ts->interp->cached_objects.typevar_type)) {
return typevar_default((typevarobject *)typeparam, NULL);
return typevar_default(typeparam, NULL);
}
else if (Py_IS_TYPE(typeparam, ts->interp->cached_objects.paramspec_type)) {
return paramspec_default(typeparam, NULL);
Expand Down