[Python-checkins] cpython: merge 3.3 (#20246)

[benjamin.peterson]

http://hg.python.org/cpython/rev/ead74e54d68f
changeset:   88457:ead74e54d68f
parent:      88452:753b8b4beee5
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Jan 13 23:14:42 2014 -0500
summary:
  merge 3.3 (#20246)

files:
  Lib/test/test_socket.py |  8 ++++++++
  Misc/ACKS               |  1 +
  Misc/NEWS               |  2 ++
  Modules/socketmodule.c  |  5 +++++
  4 files changed, 16 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -4683,6 +4683,14 @@
 
     _testRecvFromIntoMemoryview = _testRecvFromIntoArray
 
+    def testRecvFromIntoSmallBuffer(self):
+        # See issue #20246.
+        buf = bytearray(8)
+        self.assertRaises(ValueError, self.cli_conn.recvfrom_into, buf, 1024)
+
+    def _testRecvFromIntoSmallBuffer(self):
+        self.serv_conn.send(MSG*2048)
+
 
 TIPC_STYPE = 2000
 TIPC_LOWER = 200
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1218,6 +1218,7 @@
 Gregory P. Smith
 Mark Smith
 Roy Smith
+Ryan Smith-Roberts
 Rafal Smotrzyk
 Eric Snow
 Dirk Soede
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -28,6 +28,8 @@
 - Issue #20242: Fixed basicConfig() format strings for the alternative
   formatting styles. Thanks to kespindler for the bug report and patch.
 
+- Issue #20246: Fix buffer overflow in socket.recvfrom_into.
+
 - Issues #20206 and #5803: Fix edge case in email.quoprimime.encode where it
   truncated lines ending in a character needing encoding but no newline by
   using a more efficient algorithm that doesn't have the bug.
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -2875,6 +2875,11 @@
     if (recvlen == 0) {
         /* If nbytes was not specified, use the buffer's length */
         recvlen = buflen;
+    } else if (recvlen > buflen) {
+        PyBuffer_Release(&pbuf);
+        PyErr_SetString(PyExc_ValueError,
+                        "nbytes is greater than the length of the buffer");
+        return NULL;
     }
 
     readlen = sock_recvfrom_guts(s, buf, recvlen, flags, &addr);

-- 
Repository URL: http://hg.python.org/cpython