Skip to content

gh-111178: fix UBSan failures in Modules/_collectionsmodule.c #129773

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
picnixz merged 10 commits into from
Feb 17, 2025
Merged

gh-111178: fix UBSan failures in Modules/_collectionsmodule.c #129773

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
22e4df8
fix UBSan failures for `dequeobject`
picnixz Jan 25, 2025
a19302d
fix UBSan failures for `dequeiterobject`
picnixz Jan 25, 2025
7a6384e
fix UBSan failures for `defdictobject`
picnixz Jan 25, 2025
6268c5e
fix UBSan failures for `tuplegetterobject`
picnixz Jan 25, 2025
337cb29
suppress unused return values
picnixz Jan 25, 2025
cd3775b
use 'dummy' for NOARGS method
picnixz Feb 6, 2025
e825058
Merge remote-tracking branch 'upstream/main' into fix/ubsan/collectio…
picnixz Feb 7, 2025
46da2c4
Do not add an underscore to the macro if none is needed.
picnixz Feb 8, 2025
b245b68
Remove unnecessary cast
picnixz Feb 8, 2025
ef6141a
Merge branch 'main' into fix/ubsan/collections-111178
picnixz Feb 17, 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 tuplegetterobject
  • Loading branch information
@picnixz
picnixz committed Jan 25, 2025
commit 6268c5e4dfd3a991d6807bb7b342a5a6ccc98253
25 changes: 15 additions & 10 deletions Modules/_collectionsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2636,6 +2636,8 @@ typedef struct {
PyObject* doc;
} _tuplegetterobject;

#define _tuplegetterobject_CAST(op) ((_tuplegetterobject *)(op))

/*[clinic input]
@classmethod
_tuplegetter.__new__ as tuplegetter_new
Expand All @@ -2662,7 +2664,7 @@ tuplegetter_new_impl(PyTypeObject *type, Py_ssize_t index, PyObject *doc)
static PyObject *
tuplegetter_descr_get(PyObject *self, PyObject *obj, PyObject *type)
{
Py_ssize_t index = ((_tuplegetterobject*)self)->index;
Py_ssize_t index = _tuplegetterobject_CAST(self)->index;
PyObject *result;

if (obj == NULL) {
Expand Down Expand Up @@ -2703,7 +2705,7 @@ tuplegetter_descr_set(PyObject *self, PyObject *obj, PyObject *value)
static int
tuplegetter_traverse(PyObject *self, visitproc visit, void *arg)
{
_tuplegetterobject *tuplegetter = (_tuplegetterobject *)self;
_tuplegetterobject *tuplegetter = _tuplegetterobject_CAST(self);
Py_VISIT(Py_TYPE(tuplegetter));
Py_VISIT(tuplegetter->doc);
return 0;
Expand All @@ -2712,30 +2714,33 @@ tuplegetter_traverse(PyObject *self, visitproc visit, void *arg)
static int
tuplegetter_clear(PyObject *self)
{
_tuplegetterobject *tuplegetter = (_tuplegetterobject *)self;
_tuplegetterobject *tuplegetter = _tuplegetterobject_CAST(self);
Py_CLEAR(tuplegetter->doc);
return 0;
}

static void
tuplegetter_dealloc(_tuplegetterobject *self)
tuplegetter_dealloc(PyObject *self)
{
PyTypeObject *tp = Py_TYPE(self);
PyObject_GC_UnTrack(self);
tuplegetter_clear((PyObject*)self);
tp->tp_free((PyObject*)self);
(void)tuplegetter_clear(self);
tp->tp_free(self);
Py_DECREF(tp);
}

static PyObject*
tuplegetter_reduce(_tuplegetterobject *self, PyObject *Py_UNUSED(ignored))
tuplegetter_reduce(PyObject *op, PyObject *Py_UNUSED(args))
{
return Py_BuildValue("(O(nO))", (PyObject*) Py_TYPE(self), self->index, self->doc);
_tuplegetterobject *self = _tuplegetterobject_CAST(op);
return Py_BuildValue("(O(nO))", (PyObject *)Py_TYPE(self),
self->index, self->doc);
}

static PyObject*
tuplegetter_repr(_tuplegetterobject *self)
tuplegetter_repr(PyObject *op)
{
_tuplegetterobject *self = _tuplegetterobject_CAST(op);
return PyUnicode_FromFormat("%s(%zd, %R)",
_PyType_Name(Py_TYPE(self)),
self->index, self->doc);
Expand All @@ -2748,7 +2753,7 @@ static PyMemberDef tuplegetter_members[] = {
};

static PyMethodDef tuplegetter_methods[] = {
{"__reduce__", (PyCFunction)tuplegetter_reduce, METH_NOARGS, NULL},
{"__reduce__", tuplegetter_reduce, METH_NOARGS, NULL},
{NULL},
};

Expand Down