Skip to content

gh-111178: fix UBSan failures in Modules/_randommodule.c#129791

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 5 commits into from
Feb 21, 2025
Merged

gh-111178: fix UBSan failures in Modules/_randommodule.c#129791

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3beb26b
fix UBSan failures for `RandomObject`
picnixz Jan 25, 2025
141c72a
suppress unused return values
picnixz Jan 25, 2025
eadbd4f
Merge remote-tracking branch 'upstream/main' into fix/ubsan/random-11…
picnixz Feb 7, 2025
07f950e
Do Do not use `_` + capital letter in new code as it is also UB.
picnixz Feb 8, 2025
c7371c8
Merge branch 'main' into fix/ubsan/random-111178
encukou Feb 21, 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
7 changes: 4 additions & 3 deletions Modules/_randommodule.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,6 +117,7 @@ typedef struct {
uint32_t state[N];
} RandomObject;

#define RandomObject_CAST(op) ((RandomObject *)(op))

#include "clinic/_randommodule.c.h"

Expand DownExpand Up@@ -551,7 +552,7 @@ _random_Random_getrandbits_impl(RandomObject *self, int k)
}

static int
random_init(RandomObject *self, PyObject *args, PyObject *kwds)
random_init(PyObject *self, PyObject *args, PyObject *kwds)
{
PyObject *arg = NULL;
_randomstate *state = _randomstate_type(Py_TYPE(self));
Expand All@@ -570,7 +571,7 @@ random_init(RandomObject *self, PyObject *args, PyObject *kwds)
if (PyTuple_GET_SIZE(args) == 1)
arg = PyTuple_GET_ITEM(args, 0);

return random_seed(self, arg);
return random_seed(RandomObject_CAST(self), arg);
}


Expand DownExpand Up@@ -665,7 +666,7 @@ _random_clear(PyObject *module)
static void
_random_free(void *module)
{
_random_clear((PyObject *)module);
(void)_random_clear((PyObject *)module);
}

static struct PyModuleDef _randommodule = {
Expand Down