FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-159739: Handle overlapping buffers in BytesIO.readinto (#159777) · python/cpython@17df836 · GitHub

Repository navigation

Commit 17df836

Browse files
gh-159739: Handle overlapping buffers in BytesIO.readinto (#159777)
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
1 parent d51e6e5 commit 17df836

3 files changed

Lines changed: 8 additions & 1 deletion

File tree

‎Lib/test/test_io/test_memoryio.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -962,6 +962,12 @@ class CBytesIOTest(PyBytesIOTest):
962962
ioclass = io.BytesIO
963963
UnsupportedOperation = io.UnsupportedOperation
964964

965+
def test_readinto_overlapping_buffer(self):
966+
with self.ioclass(b'abcd') as stream:
967+
with stream.getbuffer()[1:] as target:
968+
self.assertEqual(stream.readinto(target), 3)
969+
self.assertEqual(stream.getvalue(), b'aabc')
970+
965971
def test_getstate(self):
966972
memio = self.ioclass()
967973
state = memio.__getstate__()
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix :class:`io.BytesIO` reads into overlapping views of the same buffer.

‎Modules/_io/bytesio.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@ _io_BytesIO_readinto_impl(bytesio *self, Py_buffer *buffer)
714714

715715
assert(self->pos + len <= PY_SSIZE_T_MAX);
716716
assert(len >= 0);
717-
memcpy(buffer->buf, PyBytes_AS_STRING(self->buf) + self->pos, len);
717+
memmove(buffer->buf, PyBytes_AS_STRING(self->buf) + self->pos, len);
718718
self->pos += len;
719719

720720
return PyLong_FromSsize_t(len);

0 commit comments

Comments
 (0)

Back | FazBrowse Home | New Git URL