Skip to content

gh-111178: fix UBSan failures in Modules/_queuemodule.c #129790

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 5 commits into from
Feb 21, 2025
Merged

gh-111178: fix UBSan failures in Modules/_queuemodule.c #129790

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1286c38
fix UBSan failures for `simplequeueobject`
picnixz Jan 25, 2025
04bcc57
suppress unused return values
picnixz Jan 25, 2025
c1fd8b6
Merge remote-tracking branch 'upstream/main' into fix/ubsan/queue-111178
picnixz Feb 7, 2025
45a1c87
Do not add an underscore to the macro if none is needed.
picnixz Feb 8, 2025
c0c5f0b
Merge branch 'main' into fix/ubsan/queue-111178
encukou Feb 21, 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: 14 additions & 8 deletions Modules/_queuemodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,35 +197,41 @@ typedef struct {
PyObject *weakreflist;
} simplequeueobject;

#define simplequeueobject_CAST(op) ((simplequeueobject *)(op))

/*[clinic input]
module _queue
class _queue.SimpleQueue "simplequeueobject *" "simplequeue_get_state_by_type(type)->SimpleQueueType"
[clinic start generated code]*/
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=0a4023fe4d198c8d]*/

static int
simplequeue_clear(simplequeueobject *self)
simplequeue_clear(PyObject *op)
{
simplequeueobject *self = simplequeueobject_CAST(op);
RingBuf_Fini(&self->buf);
return 0;
}

static void
simplequeue_dealloc(simplequeueobject *self)
simplequeue_dealloc(PyObject *op)
{
simplequeueobject *self = simplequeueobject_CAST(op);
PyTypeObject *tp = Py_TYPE(self);

PyObject_GC_UnTrack(self);
(void)simplequeue_clear(self);
if (self->weakreflist != NULL)
PyObject_ClearWeakRefs((PyObject *) self);
Py_TYPE(self)->tp_free(self);
(void)simplequeue_clear(op);
if (self->weakreflist != NULL) {
PyObject_ClearWeakRefs(op);
}
tp->tp_free(self);
Py_DECREF(tp);
}

static int
simplequeue_traverse(simplequeueobject *self, visitproc visit, void *arg)
simplequeue_traverse(PyObject *op, visitproc visit, void *arg)
{
simplequeueobject *self = simplequeueobject_CAST(op);
RingBuf *buf = &self->buf;
for (Py_ssize_t i = 0, num_items = buf->num_items; i < num_items; i++) {
Py_VISIT(RingBuf_At(buf, i));
Expand Down Expand Up @@ -514,7 +520,7 @@ queue_clear(PyObject *m)
static void
queue_free(void *m)
{
queue_clear((PyObject *)m);
(void)queue_clear((PyObject *)m);
}

#include "clinic/_queuemodule.c.h"
Expand Down
Loading