Skip to content
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

gh-111178: fix UBSan failures in Modules/_io #129083

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
+217 −150
Open

gh-111178: fix UBSan failures in Modules/_io #129083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
37bc556
fix UBSan failures for `buffered`
picnixz Jan 20, 2025
36f5adc
fix UBSan failures for `rwpair`
picnixz Jan 20, 2025
2a02293
fix UBSan failures for `bytesio`
picnixz Jan 20, 2025
fc3cd12
fix UBSan failures for `bytesiobuf`
picnixz Jan 20, 2025
cd728f5
fix UBSan failures for `iobase`
picnixz Jan 20, 2025
0da5a81
fix UBSan failures for `stringio`
picnixz Jan 20, 2025
9889af8
fix UBSan failures for `nldecoder_object`
picnixz Jan 20, 2025
19ed68d
fix UBSan failures for `textio`
picnixz Jan 20, 2025
249ec3e
fix UBSan failures for `winconsoleio`
picnixz Jan 20, 2025
cf44141
reduce diff
picnixz Jan 20, 2025
a9b3ca6
add some new lines
picnixz Jan 20, 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
93 changes: 57 additions & 36 deletions Modules/_io/bufferedio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,8 @@ typedef struct {
PyObject *weakreflist;
} buffered;

#define _buffered_CAST(op) ((buffered *)(op))

/*
Implementation notes:

Expand Down Expand Up @@ -399,25 +401,27 @@ _enter_buffered_busy(buffered *self)


static int
buffered_clear(buffered *self)
buffered_clear(PyObject *op)
{
buffered *self = _buffered_CAST(op);
self->ok = 0;
Py_CLEAR(self->raw);
Py_CLEAR(self->dict);
return 0;
}

static void
buffered_dealloc(buffered *self)
buffered_dealloc(PyObject *op)
{
buffered *self = _buffered_CAST(op);
PyTypeObject *tp = Py_TYPE(self);
self->finalizing = 1;
if (_PyIOBase_finalize((PyObject *) self) < 0)
if (_PyIOBase_finalize(op) < 0)
return;
_PyObject_GC_UNTRACK(self);
self->ok = 0;
if (self->weakreflist != NULL)
PyObject_ClearWeakRefs((PyObject *)self);
PyObject_ClearWeakRefs(op);
if (self->buffer) {
PyMem_Free(self->buffer);
self->buffer = NULL;
Expand All @@ -426,8 +430,8 @@ buffered_dealloc(buffered *self)
PyThread_free_lock(self->lock);
self->lock = NULL;
}
(void)buffered_clear(self);
tp->tp_free((PyObject *)self);
(void)buffered_clear(op);
tp->tp_free(self);
Py_DECREF(tp);
}

Expand Down Expand Up @@ -2227,6 +2231,8 @@ typedef struct {
PyObject *weakreflist;
} rwpair;

#define _rwpair_CAST(op) ((rwpair *)(op))

/*[clinic input]
_io.BufferedRWPair.__init__
reader: object
Expand Down Expand Up @@ -2276,8 +2282,9 @@ _io_BufferedRWPair___init___impl(rwpair *self, PyObject *reader,
}

static int
bufferedrwpair_traverse(rwpair *self, visitproc visit, void *arg)
bufferedrwpair_traverse(PyObject *op, visitproc visit, void *arg)
{
rwpair *self = _rwpair_CAST(op);
Py_VISIT(Py_TYPE(self));
Py_VISIT(self->dict);
Py_VISIT(self->reader);
Expand All @@ -2286,23 +2293,25 @@ bufferedrwpair_traverse(rwpair *self, visitproc visit, void *arg)
}

static int
bufferedrwpair_clear(rwpair *self)
bufferedrwpair_clear(PyObject *op)
{
rwpair *self = _rwpair_CAST(op);
Py_CLEAR(self->reader);
Py_CLEAR(self->writer);
Py_CLEAR(self->dict);
return 0;
}

static void
bufferedrwpair_dealloc(rwpair *self)
bufferedrwpair_dealloc(PyObject *op)
{
rwpair *self = _rwpair_CAST(op);
picnixz marked this conversation as resolved.
Show resolved Hide resolved
PyTypeObject *tp = Py_TYPE(self);
_PyObject_GC_UNTRACK(self);
if (self->weakreflist != NULL)
PyObject_ClearWeakRefs((PyObject *)self);
(void)bufferedrwpair_clear(self);
tp->tp_free((PyObject *) self);
PyObject_ClearWeakRefs(op);
(void)bufferedrwpair_clear(op);
tp->tp_free(self);
Py_DECREF(tp);
}

Expand All @@ -2328,62 +2337,72 @@ _forward_call(buffered *self, PyObject *name, PyObject *args)
}

static PyObject *
bufferedrwpair_read(rwpair *self, PyObject *args)
bufferedrwpair_read(PyObject *op, PyObject *args)
{
rwpair *self = _rwpair_CAST(op);
return _forward_call(self->reader, &_Py_ID(read), args);
}

static PyObject *
bufferedrwpair_peek(rwpair *self, PyObject *args)
bufferedrwpair_peek(PyObject *op, PyObject *args)
{
rwpair *self = _rwpair_CAST(op);
return _forward_call(self->reader, &_Py_ID(peek), args);
}

static PyObject *
bufferedrwpair_read1(rwpair *self, PyObject *args)
bufferedrwpair_read1(PyObject *op, PyObject *args)
{
rwpair *self = _rwpair_CAST(op);
return _forward_call(self->reader, &_Py_ID(read1), args);
}

static PyObject *
bufferedrwpair_readinto(rwpair *self, PyObject *args)
bufferedrwpair_readinto(PyObject *op, PyObject *args)
{
rwpair *self = _rwpair_CAST(op);
return _forward_call(self->reader, &_Py_ID(readinto), args);
}

static PyObject *
bufferedrwpair_readinto1(rwpair *self, PyObject *args)
bufferedrwpair_readinto1(PyObject *op, PyObject *args)
{
rwpair *self = _rwpair_CAST(op);
return _forward_call(self->reader, &_Py_ID(readinto1), args);
}

static PyObject *
bufferedrwpair_write(rwpair *self, PyObject *args)
bufferedrwpair_write(PyObject *op, PyObject *args)
{
rwpair *self = _rwpair_CAST(op);
return _forward_call(self->writer, &_Py_ID(write), args);
}

static PyObject *
bufferedrwpair_flush(rwpair *self, PyObject *Py_UNUSED(ignored))
bufferedrwpair_flush(PyObject *op, PyObject *Py_UNUSED(ignored))
{
rwpair *self = _rwpair_CAST(op);
return _forward_call(self->writer, &_Py_ID(flush), NULL);
}

static PyObject *
bufferedrwpair_readable(rwpair *self, PyObject *Py_UNUSED(ignored))
bufferedrwpair_readable(PyObject *op, PyObject *Py_UNUSED(ignored))
{
rwpair *self = _rwpair_CAST(op);
return _forward_call(self->reader, &_Py_ID(readable), NULL);
}

static PyObject *
bufferedrwpair_writable(rwpair *self, PyObject *Py_UNUSED(ignored))
bufferedrwpair_writable(PyObject *op, PyObject *Py_UNUSED(ignored))
{
rwpair *self = _rwpair_CAST(op);
return _forward_call(self->writer, &_Py_ID(writable), NULL);
}

static PyObject *
bufferedrwpair_close(rwpair *self, PyObject *Py_UNUSED(ignored))
bufferedrwpair_close(PyObject *op, PyObject *Py_UNUSED(ignored))
{
rwpair *self = _rwpair_CAST(op);
PyObject *exc = NULL;
PyObject *ret = _forward_call(self->writer, &_Py_ID(close), NULL);
if (ret == NULL) {
Expand All @@ -2401,8 +2420,9 @@ bufferedrwpair_close(rwpair *self, PyObject *Py_UNUSED(ignored))
}

static PyObject *
bufferedrwpair_isatty(rwpair *self, PyObject *Py_UNUSED(ignored))
bufferedrwpair_isatty(PyObject *op, PyObject *Py_UNUSED(ignored))
{
rwpair *self = _rwpair_CAST(op);
PyObject *ret = _forward_call(self->writer, &_Py_ID(isatty), NULL);

if (ret != Py_False) {
Expand All @@ -2415,8 +2435,9 @@ bufferedrwpair_isatty(rwpair *self, PyObject *Py_UNUSED(ignored))
}

static PyObject *
bufferedrwpair_closed_get(rwpair *self, void *context)
bufferedrwpair_closed_get(PyObject *op, void *Py_UNUSED(context))
{
rwpair *self = _rwpair_CAST(op);
if (self->writer == NULL) {
PyErr_SetString(PyExc_RuntimeError,
"the BufferedRWPair object is being garbage-collected");
Expand Down Expand Up @@ -2633,20 +2654,20 @@ PyType_Spec bufferedwriter_spec = {
};

static PyMethodDef bufferedrwpair_methods[] = {
{"read", (PyCFunction)bufferedrwpair_read, METH_VARARGS},
{"peek", (PyCFunction)bufferedrwpair_peek, METH_VARARGS},
{"read1", (PyCFunction)bufferedrwpair_read1, METH_VARARGS},
{"readinto", (PyCFunction)bufferedrwpair_readinto, METH_VARARGS},
{"readinto1", (PyCFunction)bufferedrwpair_readinto1, METH_VARARGS},
{"read", bufferedrwpair_read, METH_VARARGS},
{"peek", bufferedrwpair_peek, METH_VARARGS},
{"read1", bufferedrwpair_read1, METH_VARARGS},
{"readinto", bufferedrwpair_readinto, METH_VARARGS},
{"readinto1", bufferedrwpair_readinto1, METH_VARARGS},

{"write", (PyCFunction)bufferedrwpair_write, METH_VARARGS},
{"flush", (PyCFunction)bufferedrwpair_flush, METH_NOARGS},
{"write", bufferedrwpair_write, METH_VARARGS},
{"flush", bufferedrwpair_flush, METH_NOARGS},

{"readable", (PyCFunction)bufferedrwpair_readable, METH_NOARGS},
{"writable", (PyCFunction)bufferedrwpair_writable, METH_NOARGS},
{"readable", bufferedrwpair_readable, METH_NOARGS},
{"writable", bufferedrwpair_writable, METH_NOARGS},

{"close", (PyCFunction)bufferedrwpair_close, METH_NOARGS},
{"isatty", (PyCFunction)bufferedrwpair_isatty, METH_NOARGS},
{"close", bufferedrwpair_close, METH_NOARGS},
{"isatty", bufferedrwpair_isatty, METH_NOARGS},

{NULL, NULL}
};
Expand All @@ -2658,7 +2679,7 @@ static PyMemberDef bufferedrwpair_members[] = {
};

static PyGetSetDef bufferedrwpair_getset[] = {
{"closed", (getter)bufferedrwpair_closed_get, NULL, NULL},
{"closed", bufferedrwpair_closed_get, NULL, NULL},
{NULL}
};

Expand Down
Loading
Loading