Skip to content

gh-111178: fix UBSan failures for Modules/_testbuffer.c #131612

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
merged 2 commits into from
Mar 24, 2025
Merged

gh-111178: fix UBSan failures for Modules/_testbuffer.c #131612

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ac735d
fix UBSan failures for `Modules/_testbuffer.c`
picnixz Mar 23, 2025
a9f306a
fixup
picnixz Mar 23, 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
22 changes: 12 additions & 10 deletions Modules/_testbuffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1586,8 +1586,9 @@ ptr_from_index(Py_buffer *base, Py_ssize_t index)
}

static PyObject *
ndarray_item(NDArrayObject *self, Py_ssize_t index)
ndarray_item(PyObject *op, Py_ssize_t index)
{
NDArrayObject *self = (NDArrayObject *)op;
ndbuf_t *ndbuf = self->head;
Py_buffer *base = &ndbuf->base;
char *ptr;
Expand Down Expand Up @@ -1801,7 +1802,7 @@ ndarray_subscript(PyObject *op, PyObject *key)
Py_ssize_t index = PyLong_AsSsize_t(key);
if (index == -1 && PyErr_Occurred())
return NULL;
return ndarray_item(self, index);
return ndarray_item(op, index);
}

nd = (NDArrayObject *)ndarray_new(&NDArray_Type, NULL, NULL);
Expand Down Expand Up @@ -1966,10 +1967,10 @@ static PyMappingMethods ndarray_as_mapping = {
};

static PySequenceMethods ndarray_as_sequence = {
0, /* sq_length */
0, /* sq_concat */
0, /* sq_repeat */
(ssizeargfunc)ndarray_item, /* sq_item */
0, /* sq_length */
0, /* sq_concat */
0, /* sq_repeat */
ndarray_item, /* sq_item */
};


Expand Down Expand Up @@ -2742,16 +2743,17 @@ staticarray_init(PyObject *self, PyObject *args, PyObject *kwds)
}

static void
staticarray_dealloc(StaticArrayObject *self)
staticarray_dealloc(PyObject *self)
{
PyObject_Free(self);
}

/* Return a buffer for a PyBUF_FULL_RO request. Flags are not checked,
which makes this object a non-compliant exporter! */
static int
staticarray_getbuf(StaticArrayObject *self, Py_buffer *view, int flags)
staticarray_getbuf(PyObject *op, Py_buffer *view, int flags)
{
StaticArrayObject *self = (StaticArrayObject *)op;
*view = static_buffer;

if (self->legacy_mode) {
Expand All @@ -2765,7 +2767,7 @@ staticarray_getbuf(StaticArrayObject *self, Py_buffer *view, int flags)
}

static PyBufferProcs staticarray_as_buffer = {
(getbufferproc)staticarray_getbuf, /* bf_getbuffer */
staticarray_getbuf, /* bf_getbuffer */
NULL, /* bf_releasebuffer */
};

Expand All @@ -2774,7 +2776,7 @@ static PyTypeObject StaticArray_Type = {
"staticarray", /* Name of this type */
sizeof(StaticArrayObject), /* Basic object size */
0, /* Item size for varobject */
(destructor)staticarray_dealloc, /* tp_dealloc */
staticarray_dealloc, /* tp_dealloc */
0, /* tp_vectorcall_offset */
0, /* tp_getattr */
0, /* tp_setattr */
Expand Down
Loading