cpython: 87673659d8f7 (original) (raw)
Mercurial > cpython
changeset 88453:87673659d8f7 2.7
complain when nbytes > buflen to fix possible buffer overflow (closes #20246) [#20246]
| Benjamin Peterson benjamin@python.org | |
|---|---|
| date | Mon, 13 Jan 2014 22:59:38 -0500 |
| parents | 2631d33ee7fb |
| children | 715fd3d8ac93 950f1e83bb56 |
| files | Lib/test/test_socket.py Misc/ACKS Misc/NEWS Modules/socketmodule.c |
| diffstat | 4 files changed, 17 insertions(+), 0 deletions(-)[+] [-] Lib/test/test_socket.py 10 Misc/ACKS 1 Misc/NEWS 2 Modules/socketmodule.c 4 |
line wrap: on
line diff
--- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -1620,6 +1620,16 @@ class BufferIOTest(SocketConnectedTest): _testRecvFromIntoMemoryview = _testRecvFromIntoArray
- def testRecvFromIntoSmallBuffer(self):
# See issue #20246.[](#l1.8)buf = bytearray(8)[](#l1.9)self.assertRaises(ValueError, self.cli_conn.recvfrom_into, buf, 1024)[](#l1.10)
- def _testRecvFromIntoSmallBuffer(self):
with test_support.check_py3k_warnings():[](#l1.13)buf = buffer(MSG*2048)[](#l1.14)self.serv_conn.send(buf)[](#l1.15)
+ TIPC_STYPE = 2000 TIPC_LOWER = 200
--- a/Misc/ACKS +++ b/Misc/ACKS @@ -979,6 +979,7 @@ Eric V. Smith Christopher Smith Gregory P. Smith Roy Smith +Ryan Smith-Roberts Rafal Smotrzyk Dirk Soede Paul Sokolovsky
--- a/Misc/NEWS +++ b/Misc/NEWS @@ -35,6 +35,8 @@ Core and Builtins Library ------- +- Issue #20246: Fix buffer overflow in socket.recvfrom_into. +
--- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -2742,6 +2742,10 @@ sock_recvfrom_into(PySocketSockObject s if (recvlen == 0) { / If nbytes was not specified, use the buffer's length */ recvlen = buflen;