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
23 changes: 12 additions & 11 deletions Lib/_pyio.py
Original file line number Diff line number Diff line change
Expand Up @@ -952,20 +952,21 @@ def write(self, b):
if isinstance(b, str):
raise TypeError("can't write str to binary stream")
with memoryview(b) as view:
n = view.nbytes # Size of any bytes-like object
if self.closed:
raise ValueError("write to closed file")
if n == 0:
return 0

with self._lock:
pos = self._pos
if pos > len(self._buffer):
# Pad buffer to pos with null bytes.
self._buffer.resize(pos)
self._buffer[pos:pos + n] = b
self._pos += n
return n
n = view.nbytes # Size of any bytes-like object
if n == 0:
return 0

with self._lock:
pos = self._pos
if pos > len(self._buffer):
# Pad buffer to pos with null bytes.
self._buffer.resize(pos)
self._buffer[pos:pos + n] = view
self._pos += n
return n

def seek(self, pos, whence=0):
if self.closed:
Expand Down
22 changes: 22 additions & 0 deletions Lib/test/test_io/test_memoryio.py
Original file line number Diff line number Diff line change
Expand Up @@ -629,6 +629,28 @@ def __buffer__(self, flags):
memio = self.ioclass()
self.assertRaises(BufferError, memio.writelines, [B()])

def test_write_mutating_buffer(self):
# Test that buffer is exported only once during write().
# See: https://github.com/python/cpython/issues/143602.
class B:
count = 0
def __buffer__(self, flags):
self.count += 1
if self.count == 1:
return memoryview(b"AAA")
else:
return memoryview(b"BBBBBBBBB")

memio = self.ioclass(b'0123456789')
memio.seek(2)
b = B()
n = memio.write(b)

self.assertEqual(b.count, 1)
self.assertEqual(n, 3)
self.assertEqual(memio.getvalue(), b"01AAA56789")
self.assertEqual(memio.tell(), 5)


class TextIOTestMixin:

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix a inconsistency issue in :meth:`~io.BytesIO.write` that leads to
unexpected buffer overwrite by deduplicating the buffer exports.
Loading