Skip to content

gh-111178: fix UBSan failures in Python/hamt.c #128247

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

gh-111178: fix UBSan failures in Python/hamt.c #128247

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bbdace9
fix UBSan failures for `PyHamtObject`
picnixz Dec 23, 2024
5a7de76
fix UBSan failures for `PyHamtNode_Array`
picnixz Dec 23, 2024
b927bab
fix UBSan failures for `PyHamtNode_Collision`
picnixz Dec 23, 2024
a993bff
fix UBSan failures for `PyHamtNode_Bitmap`
picnixz Dec 23, 2024
6b23ccb
fix indentation
picnixz Dec 26, 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
Prev Previous commit
Next Next commit
fix UBSan failures for PyHamtNode_Array
  • Loading branch information
@picnixz
picnixz committed Dec 24, 2024
commit 5a7de76bc634f09a1591f16d2d1959531f16749d
30 changes: 12 additions & 18 deletions Python/hamt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,8 @@ typedef struct {
Py_ssize_t a_count;
} PyHamtNode_Array;

#define _PyHamtNode_Array_CAST(op) ((PyHamtNode_Array *)(op))


typedef struct {
PyObject_VAR_HEAD
Expand Down Expand Up @@ -1868,35 +1870,27 @@ hamt_node_array_find(PyHamtNode_Array *self,
}

static int
hamt_node_array_traverse(PyHamtNode_Array *self,
visitproc visit, void *arg)
hamt_node_array_traverse(PyObject *op, visitproc visit, void *arg)
{
/* Array's tp_traverse */

Py_ssize_t i;

for (i = 0; i < HAMT_ARRAY_NODE_SIZE; i++) {
PyHamtNode_Array *self = _PyHamtNode_Array_CAST(op);
for (Py_ssize_t i = 0; i < HAMT_ARRAY_NODE_SIZE; i++) {
Py_VISIT(self->a_array[i]);
}

return 0;
}

static void
hamt_node_array_dealloc(PyHamtNode_Array *self)
hamt_node_array_dealloc(PyObject *self)
{
/* Array's tp_dealloc */

Py_ssize_t i;

PyObject_GC_UnTrack(self);
Py_TRASHCAN_BEGIN(self, hamt_node_array_dealloc)

for (i = 0; i < HAMT_ARRAY_NODE_SIZE; i++) {
Py_XDECREF(self->a_array[i]);
PyHamtNode_Array *obj = _PyHamtNode_Array_CAST(self);
for (Py_ssize_t i = 0; i < HAMT_ARRAY_NODE_SIZE; i++) {
Py_XDECREF(obj->a_array[i]);
}

Py_TYPE(self)->tp_free((PyObject *)self);
Py_TYPE(self)->tp_free(self);
Py_TRASHCAN_END
}

Expand Down Expand Up @@ -2848,10 +2842,10 @@ PyTypeObject _PyHamt_ArrayNode_Type = {
"hamt_array_node",
sizeof(PyHamtNode_Array),
0,
.tp_dealloc = (destructor)hamt_node_array_dealloc,
.tp_dealloc = hamt_node_array_dealloc,
.tp_getattro = PyObject_GenericGetAttr,
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,
.tp_traverse = (traverseproc)hamt_node_array_traverse,
.tp_traverse = hamt_node_array_traverse,
.tp_free = PyObject_GC_Del,
.tp_hash = PyObject_HashNotImplemented,
};
Expand Down