Skip to content

gh-111178: fix UBSan failures in Objects/bytesobject.c #128237

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
Jan 10, 2025
Merged

gh-111178: fix UBSan failures in Objects/bytesobject.c #128237

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb8af8f
remove redundant casts for `bytesobject`
picnixz Dec 24, 2024
7348680
fix UBSan failures for `striterobject`
picnixz Dec 24, 2024
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
38 changes: 21 additions & 17 deletions Objects/bytesobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3074,7 +3074,7 @@ PyTypeObject PyBytes_Type = {
bytes_doc, /* tp_doc */
0, /* tp_traverse */
0, /* tp_clear */
(richcmpfunc)bytes_richcompare, /* tp_richcompare */
bytes_richcompare, /* tp_richcompare */
0, /* tp_weaklistoffset */
bytes_iter, /* tp_iter */
0, /* tp_iternext */
Expand Down Expand Up @@ -3237,24 +3237,29 @@ typedef struct {
PyBytesObject *it_seq; /* Set to NULL when iterator is exhausted */
} striterobject;

#define _striterobject_CAST(op) ((striterobject *)(op))

static void
striter_dealloc(striterobject *it)
striter_dealloc(PyObject *op)
{
striterobject *it = _striterobject_CAST(op);
_PyObject_GC_UNTRACK(it);
Py_XDECREF(it->it_seq);
PyObject_GC_Del(it);
}

static int
striter_traverse(striterobject *it, visitproc visit, void *arg)
striter_traverse(PyObject *op, visitproc visit, void *arg)
{
striterobject *it = _striterobject_CAST(op);
Py_VISIT(it->it_seq);
return 0;
}

static PyObject *
striter_next(striterobject *it)
striter_next(PyObject *op)
{
striterobject *it = _striterobject_CAST(op);
PyBytesObject *seq;

assert(it != NULL);
Expand All @@ -3274,8 +3279,9 @@ striter_next(striterobject *it)
}

static PyObject *
striter_len(striterobject *it, PyObject *Py_UNUSED(ignored))
striter_len(PyObject *op, PyObject *Py_UNUSED(ignored))
{
striterobject *it = _striterobject_CAST(op);
Py_ssize_t len = 0;
if (it->it_seq)
len = PyBytes_GET_SIZE(it->it_seq) - it->it_index;
Expand All @@ -3286,14 +3292,14 @@ PyDoc_STRVAR(length_hint_doc,
"Private method returning an estimate of len(list(it)).");

static PyObject *
striter_reduce(striterobject *it, PyObject *Py_UNUSED(ignored))
striter_reduce(PyObject *op, PyObject *Py_UNUSED(ignored))
{
PyObject *iter = _PyEval_GetBuiltin(&_Py_ID(iter));

/* _PyEval_GetBuiltin can invoke arbitrary code,
* call must be before access of iterator pointers.
* see issue #101765 */

striterobject *it = _striterobject_CAST(op);
if (it->it_seq != NULL) {
return Py_BuildValue("N(O)n", iter, it->it_seq, it->it_index);
} else {
Expand All @@ -3304,11 +3310,12 @@ striter_reduce(striterobject *it, PyObject *Py_UNUSED(ignored))
PyDoc_STRVAR(reduce_doc, "Return state information for pickling.");

static PyObject *
striter_setstate(striterobject *it, PyObject *state)
striter_setstate(PyObject *op, PyObject *state)
{
Py_ssize_t index = PyLong_AsSsize_t(state);
if (index == -1 && PyErr_Occurred())
return NULL;
striterobject *it = _striterobject_CAST(op);
if (it->it_seq != NULL) {
if (index < 0)
index = 0;
Expand All @@ -3322,12 +3329,9 @@ striter_setstate(striterobject *it, PyObject *state)
PyDoc_STRVAR(setstate_doc, "Set state information for unpickling.");

static PyMethodDef striter_methods[] = {
{"__length_hint__", (PyCFunction)striter_len, METH_NOARGS,
length_hint_doc},
{"__reduce__", (PyCFunction)striter_reduce, METH_NOARGS,
reduce_doc},
{"__setstate__", (PyCFunction)striter_setstate, METH_O,
setstate_doc},
{"__length_hint__", striter_len, METH_NOARGS, length_hint_doc},
{"__reduce__", striter_reduce, METH_NOARGS, reduce_doc},
{"__setstate__", striter_setstate, METH_O, setstate_doc},
{NULL, NULL} /* sentinel */
};

Expand All @@ -3337,7 +3341,7 @@ PyTypeObject PyBytesIter_Type = {
sizeof(striterobject), /* tp_basicsize */
0, /* tp_itemsize */
/* methods */
(destructor)striter_dealloc, /* tp_dealloc */
striter_dealloc, /* tp_dealloc */
0, /* tp_vectorcall_offset */
0, /* tp_getattr */
0, /* tp_setattr */
Expand All @@ -3354,12 +3358,12 @@ PyTypeObject PyBytesIter_Type = {
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */
0, /* tp_doc */
(traverseproc)striter_traverse, /* tp_traverse */
striter_traverse, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
PyObject_SelfIter, /* tp_iter */
(iternextfunc)striter_next, /* tp_iternext */
striter_next, /* tp_iternext */
striter_methods, /* tp_methods */
0,
};
Expand Down
Loading