Skip to content

gh-111178: fix UBSan failures in Modules/_winapi.c #129796

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 24, 2025
Merged

gh-111178: fix UBSan failures in Modules/_winapi.c #129796

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fccf4cb
fix UBSan failures for `OverlappedObject`
picnixz Jan 25, 2025
c38e3d3
suppress unused return values
picnixz Jan 25, 2025
cc1f0c1
Merge remote-tracking branch 'upstream/main' into fix/ubsan/winapi-11…
picnixz Feb 7, 2025
72737d0
Do Do not use `_` + capital letter in new code as it is also UB.
picnixz Feb 8, 2025
30a8a6b
Merge branch 'main' into fix/ubsan/winapi-111178
encukou Feb 18, 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
10 changes: 7 additions & 3 deletions Modules/_winapi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,25 +144,29 @@ typedef struct {
Py_buffer write_buffer;
} OverlappedObject;

#define OverlappedObject_CAST(op) ((OverlappedObject *)(op))

/*
Note: tp_clear (overlapped_clear) is not implemented because it
requires cancelling the IO operation if it's pending and the cancellation is
quite complex and can fail (see: overlapped_dealloc).
*/
static int
overlapped_traverse(OverlappedObject *self, visitproc visit, void *arg)
overlapped_traverse(PyObject *op, visitproc visit, void *arg)
{
OverlappedObject *self = OverlappedObject_CAST(op);
Py_VISIT(self->read_buffer);
Py_VISIT(self->write_buffer.obj);
Py_VISIT(Py_TYPE(self));
return 0;
}

static void
overlapped_dealloc(OverlappedObject *self)
overlapped_dealloc(PyObject *op)
{
DWORD bytes;
int err = GetLastError();
OverlappedObject *self = OverlappedObject_CAST(op);

PyObject_GC_UnTrack(self);
if (self->pending) {
Expand Down Expand Up @@ -3215,7 +3219,7 @@ winapi_clear(PyObject *module)
static void
winapi_free(void *module)
{
winapi_clear((PyObject *)module);
(void)winapi_clear((PyObject *)module);
}

static struct PyModuleDef winapi_module = {
Expand Down
Loading