mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

gh-111178: fix UBSan failures in Objects/bytearrayobject.c (GH-128236)

Browse source 
* fix UBSan failures for `bytesiterobject`
* fix UBSan failures for `PyByteArrayObject`
This commit is contained in:
Bénédikt Tran 2025-01-10 11:50:02 +01:00 • committed by GitHub
parent 295776c7f3
commit 613240bf03
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Objects/bytearrayobject.c
View file

@ -2113,8 +2113,9 @@ PyDoc_STRVAR(alloc_doc,
Return the number of bytes actually allocated."); Return the number of bytes actually allocated.");
static PyObject * static PyObject *
bytearray_alloc(PyByteArrayObject *self, PyObject *Py_UNUSED(ignored)) bytearray_alloc(PyObject *op, PyObject *Py_UNUSED(ignored))
{ {
PyByteArrayObject *self = _PyByteArray_CAST(op);
return PyLong_FromSsize_t(self->ob_alloc); return PyLong_FromSsize_t(self->ob_alloc);
} }
@ -2313,7 +2314,7 @@ static PyBufferProcs bytearray_as_buffer = {
}; };
static PyMethodDef bytearray_methods[] = { static PyMethodDef bytearray_methods[] = {
{"__alloc__", (PyCFunction)bytearray_alloc, METH_NOARGS, alloc_doc}, {"__alloc__", bytearray_alloc, METH_NOARGS, alloc_doc},
BYTEARRAY_REDUCE_METHODDEF BYTEARRAY_REDUCE_METHODDEF
BYTEARRAY_REDUCE_EX_METHODDEF BYTEARRAY_REDUCE_EX_METHODDEF
BYTEARRAY_SIZEOF_METHODDEF BYTEARRAY_SIZEOF_METHODDEF
@ -2464,24 +2465,29 @@ typedef struct {
PyByteArrayObject *it_seq; /* Set to NULL when iterator is exhausted */ PyByteArrayObject *it_seq; /* Set to NULL when iterator is exhausted */
} bytesiterobject; } bytesiterobject;
#define _bytesiterobject_CAST(op) ((bytesiterobject *)(op))
static void static void
bytearrayiter_dealloc(bytesiterobject *it) bytearrayiter_dealloc(PyObject *self)
{ {
bytesiterobject *it = _bytesiterobject_CAST(self);
_PyObject_GC_UNTRACK(it); _PyObject_GC_UNTRACK(it);
Py_XDECREF(it->it_seq); Py_XDECREF(it->it_seq);
PyObject_GC_Del(it); PyObject_GC_Del(it);
} }
static int static int
bytearrayiter_traverse(bytesiterobject *it, visitproc visit, void *arg) bytearrayiter_traverse(PyObject *self, visitproc visit, void *arg)
{ {
bytesiterobject *it = _bytesiterobject_CAST(self);
Py_VISIT(it->it_seq); Py_VISIT(it->it_seq);
return 0; return 0;
} }
static PyObject * static PyObject *
bytearrayiter_next(bytesiterobject *it) bytearrayiter_next(PyObject *self)
{ {
bytesiterobject *it = _bytesiterobject_CAST(self);
PyByteArrayObject *seq; PyByteArrayObject *seq;
assert(it != NULL); assert(it != NULL);
@ -2501,8 +2507,9 @@ bytearrayiter_next(bytesiterobject *it)
} }
static PyObject * static PyObject *
bytearrayiter_length_hint(bytesiterobject *it, PyObject *Py_UNUSED(ignored)) bytearrayiter_length_hint(PyObject *self, PyObject *Py_UNUSED(ignored))
{ {
bytesiterobject *it = _bytesiterobject_CAST(self);
Py_ssize_t len = 0; Py_ssize_t len = 0;
if (it->it_seq) { if (it->it_seq) {
len = PyByteArray_GET_SIZE(it->it_seq) - it->it_index; len = PyByteArray_GET_SIZE(it->it_seq) - it->it_index;
@ -2517,14 +2524,14 @@ PyDoc_STRVAR(length_hint_doc,
"Private method returning an estimate of len(list(it))."); "Private method returning an estimate of len(list(it)).");
static PyObject * static PyObject *
bytearrayiter_reduce(bytesiterobject *it, PyObject *Py_UNUSED(ignored)) bytearrayiter_reduce(PyObject *self, PyObject *Py_UNUSED(ignored))
{ {
PyObject *iter = _PyEval_GetBuiltin(&_Py_ID(iter)); PyObject *iter = _PyEval_GetBuiltin(&_Py_ID(iter));
/* _PyEval_GetBuiltin can invoke arbitrary code, /* _PyEval_GetBuiltin can invoke arbitrary code,
* call must be before access of iterator pointers. * call must be before access of iterator pointers.
* see issue #101765 */ * see issue #101765 */
bytesiterobject *it = _bytesiterobject_CAST(self);
if (it->it_seq != NULL) { if (it->it_seq != NULL) {
return Py_BuildValue("N(O)n", iter, it->it_seq, it->it_index); return Py_BuildValue("N(O)n", iter, it->it_seq, it->it_index);
} else { } else {
@ -2533,11 +2540,13 @@ bytearrayiter_reduce(bytesiterobject *it, PyObject *Py_UNUSED(ignored))
} }
static PyObject * static PyObject *
bytearrayiter_setstate(bytesiterobject *it, PyObject *state) bytearrayiter_setstate(PyObject *self, PyObject *state)
{ {
Py_ssize_t index = PyLong_AsSsize_t(state); Py_ssize_t index = PyLong_AsSsize_t(state);
if (index == -1 && PyErr_Occurred()) if (index == -1 && PyErr_Occurred())
return NULL; return NULL;
bytesiterobject *it = _bytesiterobject_CAST(self);
if (it->it_seq != NULL) { if (it->it_seq != NULL) {
if (index < 0) if (index < 0)
index = 0; index = 0;
@ -2551,11 +2560,11 @@ bytearrayiter_setstate(bytesiterobject *it, PyObject *state)
PyDoc_STRVAR(setstate_doc, "Set state information for unpickling."); PyDoc_STRVAR(setstate_doc, "Set state information for unpickling.");
static PyMethodDef bytearrayiter_methods[] = { static PyMethodDef bytearrayiter_methods[] = {
{"__length_hint__", (PyCFunction)bytearrayiter_length_hint, METH_NOARGS, {"__length_hint__", bytearrayiter_length_hint, METH_NOARGS,
length_hint_doc}, length_hint_doc},
{"__reduce__", (PyCFunction)bytearrayiter_reduce, METH_NOARGS, {"__reduce__", bytearrayiter_reduce, METH_NOARGS,
bytearray_reduce__doc__}, bytearray_reduce__doc__},
{"__setstate__", (PyCFunction)bytearrayiter_setstate, METH_O, {"__setstate__", bytearrayiter_setstate, METH_O,
setstate_doc}, setstate_doc},
{NULL, NULL} /* sentinel */ {NULL, NULL} /* sentinel */
}; };
@ -2566,7 +2575,7 @@ PyTypeObject PyByteArrayIter_Type = {
sizeof(bytesiterobject), /* tp_basicsize */ sizeof(bytesiterobject), /* tp_basicsize */
0, /* tp_itemsize */ 0, /* tp_itemsize */
/* methods */ /* methods */
(destructor)bytearrayiter_dealloc, /* tp_dealloc */ bytearrayiter_dealloc, /* tp_dealloc */
0, /* tp_vectorcall_offset */ 0, /* tp_vectorcall_offset */
0, /* tp_getattr */ 0, /* tp_getattr */
0, /* tp_setattr */ 0, /* tp_setattr */
@ -2583,12 +2592,12 @@ PyTypeObject PyByteArrayIter_Type = {
0, /* tp_as_buffer */ 0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */
0, /* tp_doc */ 0, /* tp_doc */
(traverseproc)bytearrayiter_traverse, /* tp_traverse */ bytearrayiter_traverse, /* tp_traverse */
0, /* tp_clear */ 0, /* tp_clear */
0, /* tp_richcompare */ 0, /* tp_richcompare */
0, /* tp_weaklistoffset */ 0, /* tp_weaklistoffset */
PyObject_SelfIter, /* tp_iter */ PyObject_SelfIter, /* tp_iter */
(iternextfunc)bytearrayiter_next, /* tp_iternext */ bytearrayiter_next, /* tp_iternext */
bytearrayiter_methods, /* tp_methods */ bytearrayiter_methods, /* tp_methods */
0, 0,
}; };