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_Bitmap
  • Loading branch information
@picnixz
picnixz committed Dec 24, 2024
commit a993bff73a6fc5daf956c38bd620fbf0029f23cf
29 changes: 14 additions & 15 deletions Python/hamt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,8 @@ _hamt_dump_ident(PyUnicodeWriter *writer, int level)
#endif /* Py_DEBUG */
/////////////////////////////////// Bitmap Node

#define _PyHamtNode_Bitmap_CAST(op) ((PyHamtNode_Bitmap *)(op))


static PyHamtNode *
hamt_node_bitmap_new(Py_ssize_t size)
Expand Down Expand Up @@ -1087,30 +1089,27 @@ hamt_node_bitmap_find(PyHamtNode_Bitmap *self,
}

static int
hamt_node_bitmap_traverse(PyHamtNode_Bitmap *self, visitproc visit, void *arg)
hamt_node_bitmap_traverse(PyObject *op, visitproc visit, void *arg)
{
/* Bitmap's tp_traverse */

Py_ssize_t i;

for (i = Py_SIZE(self); --i >= 0; ) {
PyHamtNode_Bitmap *self = _PyHamtNode_Bitmap_CAST(op);
for (Py_ssize_t i = Py_SIZE(self); --i >= 0;) {
Py_VISIT(self->b_array[i]);
}

return 0;
}

static void
hamt_node_bitmap_dealloc(PyHamtNode_Bitmap *self)
hamt_node_bitmap_dealloc(PyObject *self)
{
/* Bitmap's tp_dealloc */

Py_ssize_t len = Py_SIZE(self);
Py_ssize_t i;
PyHamtNode_Bitmap *node = _PyHamtNode_Bitmap_CAST(self);
Py_ssize_t i, len = Py_SIZE(self);

if (Py_SIZE(self) == 0) {
if (len == 0) {
/* The empty node is statically allocated. */
assert(self == &_Py_SINGLETON(hamt_bitmap_node_empty));
assert(node == &_Py_SINGLETON(hamt_bitmap_node_empty));
#ifdef Py_DEBUG
_Py_FatalRefcountError("deallocating the empty hamt node bitmap singleton");
#else
Expand All @@ -1124,11 +1123,11 @@ hamt_node_bitmap_dealloc(PyHamtNode_Bitmap *self)
if (len > 0) {
i = len;
while (--i >= 0) {
Py_XDECREF(self->b_array[i]);
Py_XDECREF(node->b_array[i]);
}
}

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

Expand Down Expand Up @@ -2849,10 +2848,10 @@ PyTypeObject _PyHamt_BitmapNode_Type = {
"hamt_bitmap_node",
sizeof(PyHamtNode_Bitmap) - sizeof(PyObject *),
sizeof(PyObject *),
.tp_dealloc = (destructor)hamt_node_bitmap_dealloc,
.tp_dealloc = hamt_node_bitmap_dealloc,
.tp_getattro = PyObject_GenericGetAttr,
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,
.tp_traverse = (traverseproc)hamt_node_bitmap_traverse,
.tp_traverse = hamt_node_bitmap_traverse,
.tp_free = PyObject_GC_Del,
.tp_hash = PyObject_HashNotImplemented,
};
Expand Down