3 # User Benjamin Peterson <benjamin@python.org>
4 # Date 1389671978 18000
5 # Node ID 87673659d8f7ba1623cd4914f09ad3d2ade034e9
6 # Parent 2631d33ee7fbd5f0288931ef37872218d511d2e8
7 complain when nbytes > buflen to fix possible buffer overflow (closes #20246)
9 diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
10 --- a/Lib/test/test_socket.py
11 +++ b/Lib/test/test_socket.py
12 @@ -1620,6 +1620,16 @@ class BufferIOTest(SocketConnectedTest):
14 _testRecvFromIntoMemoryview = _testRecvFromIntoArray
16 + def testRecvFromIntoSmallBuffer(self):
19 + self.assertRaises(ValueError, self.cli_conn.recvfrom_into, buf, 1024)
21 + def _testRecvFromIntoSmallBuffer(self):
22 + with test_support.check_py3k_warnings():
23 + buf = buffer(MSG*2048)
24 + self.serv_conn.send(buf)
29 diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
30 --- a/Modules/socketmodule.c
31 +++ b/Modules/socketmodule.c
32 @@ -2742,6 +2742,10 @@ sock_recvfrom_into(PySocketSockObject *s
34 /* If nbytes was not specified, use the buffer's length */
36 + } else if (recvlen > buflen) {
37 + PyErr_SetString(PyExc_ValueError,
38 + "nbytes is greater than the length of the buffer");
42 readlen = sock_recvfrom_guts(s, buf.buf, recvlen, flags, &addr);