Skip to content

gh-111178: fix UBSan failures in Modules/xx*.c #129797

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 7 commits into from
Feb 25, 2025
+112 −77
Merged

gh-111178: fix UBSan failures in Modules/xx*.c #129797

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1ffb6a4
fix UBSan failures in `Modules/xxlimited.c`
picnixz Jan 25, 2025
c1168ec
fix UBSan failures in `Modules/xxlimited_35.c`
picnixz Jan 25, 2025
554c51c
fix UBSan failures in `Modules/xxsubtype.c`
picnixz Jan 25, 2025
8faa580
fix UBSan failures in `Modules/xxmodule.c`
picnixz Jan 25, 2025
3ddad7e
Merge remote-tracking branch 'upstream/main' into fix/ubsan/xx-111178
picnixz Feb 7, 2025
5b7becd
Do Do not use `_` + capital letter in new code as it is also UB.
picnixz Feb 8, 2025
33e684c
Merge branch 'main' into fix/ubsan/xx-111178
encukou Feb 18, 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 in Modules/xxsubtype.c
  • Loading branch information
@picnixz
picnixz committed Jan 25, 2025
commit 554c51c5520666ff8aa6be95a287a5e319596ef9
60 changes: 38 additions & 22 deletions Modules/xxsubtype.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,26 @@ typedef struct {
int state;
} spamlistobject;

#define _spamlistobject_CAST(op) ((spamlistobject *)(op))

static PyObject *
spamlist_getstate(spamlistobject *self, PyObject *args)
spamlist_getstate(PyObject *op, PyObject *args)
{
if (!PyArg_ParseTuple(args, ":getstate"))
if (!PyArg_ParseTuple(args, ":getstate")) {
return NULL;
}
spamlistobject *self = _spamlistobject_CAST(op);
return PyLong_FromLong(self->state);
}

static PyObject *
spamlist_setstate(spamlistobject *self, PyObject *args)
spamlist_setstate(PyObject *op, PyObject *args)
{
int state;

if (!PyArg_ParseTuple(args, "i:setstate", &state))
if (!PyArg_ParseTuple(args, "i:setstate", &state)) {
return NULL;
}
spamlistobject *self = _spamlistobject_CAST(op);
self->state = state;
return Py_NewRef(Py_None);
}
Expand All @@ -63,9 +68,9 @@ spamlist_specialmeth(PyObject *self, PyObject *args, PyObject *kw)
}

static PyMethodDef spamlist_methods[] = {
{"getstate", (PyCFunction)spamlist_getstate, METH_VARARGS,
{"getstate", spamlist_getstate, METH_VARARGS,
PyDoc_STR("getstate() -> state")},
{"setstate", (PyCFunction)spamlist_setstate, METH_VARARGS,
{"setstate", spamlist_setstate, METH_VARARGS,
PyDoc_STR("setstate(state)")},
/* These entries differ only in the flags; they are used by the tests
in test.test_descr. */
Expand All @@ -79,22 +84,25 @@ static PyMethodDef spamlist_methods[] = {
};

static int
spamlist_init(spamlistobject *self, PyObject *args, PyObject *kwds)
spamlist_init(PyObject *op, PyObject *args, PyObject *kwds)
{
if (PyList_Type.tp_init((PyObject *)self, args, kwds) < 0)
if (PyList_Type.tp_init(op, args, kwds) < 0) {
return -1;
}
spamlistobject *self = _spamlistobject_CAST(op);
self->state = 0;
return 0;
}

static PyObject *
spamlist_state_get(spamlistobject *self, void *Py_UNUSED(ignored))
spamlist_state_get(PyObject *op, void *Py_UNUSED(closure))
{
spamlistobject *self = _spamlistobject_CAST(op);
return PyLong_FromLong(self->state);
}

static PyGetSetDef spamlist_getsets[] = {
{"state", (getter)spamlist_state_get, NULL,
{"state", spamlist_state_get, NULL,
PyDoc_STR("an int variable for demonstration purposes")},
{0}
};
Expand Down Expand Up @@ -135,7 +143,7 @@ static PyTypeObject spamlist_type = {
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
(initproc)spamlist_init, /* tp_init */
spamlist_init, /* tp_init */
0, /* tp_alloc */
0, /* tp_new */
};
Expand All @@ -147,38 +155,46 @@ typedef struct {
int state;
} spamdictobject;

#define _spamdictobject_CAST(op) ((spamdictobject *)(op))

static PyObject *
spamdict_getstate(spamdictobject *self, PyObject *args)
spamdict_getstate(PyObject *op, PyObject *args)
{
if (!PyArg_ParseTuple(args, ":getstate"))
if (!PyArg_ParseTuple(args, ":getstate")) {
return NULL;
}
spamdictobject *self = _spamdictobject_CAST(op);
return PyLong_FromLong(self->state);
}

static PyObject *
spamdict_setstate(spamdictobject *self, PyObject *args)
spamdict_setstate(PyObject *op, PyObject *args)
{
int state;

if (!PyArg_ParseTuple(args, "i:setstate", &state))
if (!PyArg_ParseTuple(args, "i:setstate", &state)) {
return NULL;
}

spamdictobject *self = _spamdictobject_CAST(op);
self->state = state;
return Py_NewRef(Py_None);
}

static PyMethodDef spamdict_methods[] = {
{"getstate", (PyCFunction)spamdict_getstate, METH_VARARGS,
{"getstate", spamdict_getstate, METH_VARARGS,
PyDoc_STR("getstate() -> state")},
{"setstate", (PyCFunction)spamdict_setstate, METH_VARARGS,
{"setstate", spamdict_setstate, METH_VARARGS,
PyDoc_STR("setstate(state)")},
{NULL, NULL},
};

static int
spamdict_init(spamdictobject *self, PyObject *args, PyObject *kwds)
spamdict_init(PyObject *op, PyObject *args, PyObject *kwds)
{
if (PyDict_Type.tp_init((PyObject *)self, args, kwds) < 0)
if (PyDict_Type.tp_init(op, args, kwds) < 0) {
return -1;
}
spamdictobject *self = _spamdictobject_CAST(op);
self->state = 0;
return 0;
}
Expand Down Expand Up @@ -225,7 +241,7 @@ static PyTypeObject spamdict_type = {
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
(initproc)spamdict_init, /* tp_init */
spamdict_init, /* tp_init */
0, /* tp_alloc */
0, /* tp_new */
};
Expand Down