mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

gh-99941: Ensure that asyncio.Protocol.data_received receives immutable bytes (#100053)

Browse source
This commit is contained in:
DarioDaF 2022-12-11 00:07:02 +01:00 • committed by GitHub
parent d5f8a2b6ad
commit 1bb68ba6d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/asyncio/proactor_events.py
View file

@ -288,7 +288,8 @@ class _ProactorReadPipeTransport(_ProactorBasePipeTransport,
# we got end-of-file so no need to reschedule a new read # we got end-of-file so no need to reschedule a new read
return return
data = self._data[:length] # It's a new slice so make it immutable so protocols upstream don't have problems
data = bytes(memoryview(self._data)[:length])
else: else:
# the future will be replaced by next proactor.recv call # the future will be replaced by next proactor.recv call
fut.cancel() fut.cancel()

4
Lib/asyncio/streams.py
View file

@ -688,7 +688,7 @@ class StreamReader:
await self._wait_for_data('read') await self._wait_for_data('read')
# This will work right even if buffer is less than n bytes # This will work right even if buffer is less than n bytes
data = bytes(self._buffer[:n]) data = bytes(memoryview(self._buffer)[:n])
del self._buffer[:n] del self._buffer[:n]
self._maybe_resume_transport() self._maybe_resume_transport()
@ -730,7 +730,7 @@ class StreamReader:
data = bytes(self._buffer) data = bytes(self._buffer)
self._buffer.clear() self._buffer.clear()
else: else:
data = bytes(self._buffer[:n]) data = bytes(memoryview(self._buffer)[:n])
del self._buffer[:n] del self._buffer[:n]
self._maybe_resume_transport() self._maybe_resume_transport()
return data return data

5
Lib/test/test_asyncio/test_proactor_events.py
View file

@ -75,7 +75,10 @@ class ProactorSocketTransportTests(test_utils.TestCase):
called_buf = bytearray(self.buffer_size) called_buf = bytearray(self.buffer_size)
called_buf[:len(buf)] = buf called_buf[:len(buf)] = buf
self.loop._proactor.recv_into.assert_called_with(self.sock, called_buf) self.loop._proactor.recv_into.assert_called_with(self.sock, called_buf)
self.protocol.data_received.assert_called_with(bytearray(buf)) self.protocol.data_received.assert_called_with(buf)
# assert_called_with maps bytearray and bytes to the same thing so check manually
# regression test for https://github.com/python/cpython/issues/99941
self.assertIsInstance(self.protocol.data_received.call_args.args[0], bytes)
@unittest.skipIf(sys.flags.optimize, "Assertions are disabled in optimized mode") @unittest.skipIf(sys.flags.optimize, "Assertions are disabled in optimized mode")
def test_loop_reading_no_data(self): def test_loop_reading_no_data(self):

2
Misc/NEWS.d/next/Windows/2022-12-06-11-16-46.gh-issue-99941.GmUQ6o.rst Normal file
View file

@ -0,0 +1,2 @@
Ensure that :func:`asyncio.Protocol.data_received` receives an immutable
:class:`bytes` object (as documented), instead of :class:`bytearray`.