Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 24 additions & 0 deletions Lib/test/test_io/test_bufferedio.py
Original file line number Diff line number Diff line change
Expand Up @@ -1522,6 +1522,30 @@ def test_args_error(self):
with self.assertRaisesRegex(TypeError, "BufferedRandom"):
self.tp(self.BytesIO(), 1024, 1024, 1024)

def test_reentrant_detach(self):
# gh-154997: detach() from a raw callback used to crash.
def detach(*args):
bufio.detach()
return 1 # partial, so the operation calls raw again
rawio = self.MockRawIO()
rawio.readinto = rawio.write = detach
bufio = self.tp(rawio, buffer_size=4)
bufio.flush = lambda: None # don't fail in detach()'s flush
self.assertRaisesRegex(RuntimeError, "reentrant", bufio.read, 8)
self.assertRaisesRegex(RuntimeError, "reentrant", bufio.write, b"x" * 8)
self.assertIs(bufio.raw, rawio)
del rawio.readinto, rawio.write

def test_detach_during_close(self):
def flush():
del bufio.flush
bufio.detach()
rawio = self.MockRawIO()
bufio = self.tp(rawio)
bufio.flush = flush
self.assertRaisesRegex(ValueError, "detached", bufio.close)
self.assertFalse(rawio.closed)


class PyBufferedRandomTest(BufferedRandomTest, PyTestCase):
tp = pyio.BufferedRandom
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a crash in :meth:`io.BufferedIOBase.detach`.
50 changes: 34 additions & 16 deletions Modules/_io/bufferedio.c
Original file line number Diff line number Diff line change
Expand Up @@ -340,27 +340,29 @@ _enter_buffered_busy(buffered *self)
PyThread_release_lock(self->lock); \
} while(0);

static inline int
buffered_check_initialized(buffered *self)
{
if (self->ok > 0) {
return 0;
}
if (self->detached) {
PyErr_SetString(PyExc_ValueError, "raw stream has been detached");
}
else {
PyErr_SetString(PyExc_ValueError,
"I/O operation on uninitialized object");
}
return -1;
}

#define CHECK_INITIALIZED(self) \
if (self->ok <= 0) { \
if (self->detached) { \
PyErr_SetString(PyExc_ValueError, \
"raw stream has been detached"); \
} else { \
PyErr_SetString(PyExc_ValueError, \
"I/O operation on uninitialized object"); \
} \
if (buffered_check_initialized(self) < 0) { \
return NULL; \
}

#define CHECK_INITIALIZED_INT(self) \
if (self->ok <= 0) { \
if (self->detached) { \
PyErr_SetString(PyExc_ValueError, \
"raw stream has been detached"); \
} else { \
PyErr_SetString(PyExc_ValueError, \
"I/O operation on uninitialized object"); \
} \
if (buffered_check_initialized(self) < 0) { \
return -1; \
}

Expand Down Expand Up @@ -589,6 +591,11 @@ _io__Buffered_close_impl(buffered *self)
if (r < 0) {
exc = PyErr_GetRaisedException();
}
/* flush() ran without the lock and may have detached raw. */
if (buffered_check_initialized(self) < 0) {
_PyErr_ChainExceptions1(exc);
goto end;
}

res = PyObject_CallMethodNoArgs(self->raw, &_Py_ID(close));

Expand Down Expand Up @@ -624,10 +631,21 @@ _io__Buffered_detach_impl(buffered *self)
if (_PyFile_Flush((PyObject *)self) < 0) {
return NULL;
}
/* Operations on raw hold the lock, so a reentrant detach() raises
instead of clearing self->raw under them. */
if (!ENTER_BUFFERED(self)) {
return NULL;
}
/* flush() may have detached raw. */
if (buffered_check_initialized(self) < 0) {
LEAVE_BUFFERED(self)
return NULL;
}
raw = self->raw;
self->raw = NULL;
self->detached = 1;
self->ok = 0;
LEAVE_BUFFERED(self)
return raw;
}

Expand Down
Loading