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
8 changes: 6 additions & 2 deletions Lib/_pyio.py
Original file line number Diff line number Diff line change
Expand Up @@ -1394,8 +1394,12 @@ def __init__(self, reader, writer, buffer_size=DEFAULT_BUFFER_SIZE):
if not writer.writable():
raise OSError('"writer" argument must be writable.')

self.reader = BufferedReader(reader, buffer_size)
self.writer = BufferedWriter(writer, buffer_size)
new_reader = BufferedReader(reader, buffer_size)
new_writer = BufferedWriter(writer, buffer_size)
# Release a previous writer before a previous reader so it flushes
# before the reader closes a shared raw stream.
self.writer = new_writer
self.reader = new_reader

def read(self, size=-1):
if size is None:
Expand Down
15 changes: 15 additions & 0 deletions Lib/test/test_io/test_bufferedio.py
Original file line number Diff line number Diff line change
Expand Up @@ -1032,6 +1032,21 @@ def test_uninitialized(self):
self.assertEqual(pair.read(0), b'')
self.assertEqual(pair.write(b''), 0)

def test_reinit(self):
# gh-162246: Calling __init__() again must release the previous
# reader and writer, the writer first so it flushes before the
# reader closes a shared raw stream.
raw = self.MockRawIO()
pair = self.tp(raw, raw)
pair.write(b"abc")
ref = weakref.ref(raw)
pair.__init__(self.MockRawIO(), self.MockRawIO())
support.gc_collect()
self.assertEqual(raw._write_stack, [b"abc"])
del raw
support.gc_collect()
self.assertIsNone(ref())

def test_detach(self):
pair = self.tp(self.MockRawIO(), self.MockRawIO())
self.assertRaises(self.UnsupportedOperation, pair.detach)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix a reference leak in :class:`io.BufferedRWPair` when :meth:`~object.__init__`
is called more than once: the previous reader and writer are now released.
15 changes: 10 additions & 5 deletions Modules/_io/bufferedio.c
Original file line number Diff line number Diff line change
Expand Up @@ -2287,20 +2287,25 @@ _io_BufferedRWPair___init___impl(rwpair *self, PyObject *reader,
return -1;
}

self->reader = (buffered *) PyObject_CallFunction(
buffered *new_reader = (buffered *) PyObject_CallFunction(
(PyObject *)state->PyBufferedReader_Type,
"On", reader, buffer_size);
if (self->reader == NULL)
if (new_reader == NULL) {
return -1;
}

self->writer = (buffered *) PyObject_CallFunction(
buffered *new_writer = (buffered *) PyObject_CallFunction(
(PyObject *)state->PyBufferedWriter_Type,
"On", writer, buffer_size);
if (self->writer == NULL) {
Py_CLEAR(self->reader);
if (new_writer == NULL) {
Py_DECREF(new_reader);
return -1;
}

/* Release a previous writer before a previous reader, see
bufferedrwpair_clear(). */
Py_XSETREF(self->writer, new_writer);
Py_XSETREF(self->reader, new_reader);
return 0;
}

Expand Down
Loading