summaryrefslogtreecommitdiff
path: root/lang/python32/files/patch-CVE-2014-1912
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2015-12-21 18:13:33 +0000
committerMartin Wilke <miwi@FreeBSD.org>2015-12-21 18:13:33 +0000
commitdf08d0c78547197da445a241c2b4418a0b5619fb (patch)
tree01630e4fc53ee3ffc1ee197b664b3ed6dbb603b4 /lang/python32/files/patch-CVE-2014-1912
parentUpdate Calligra to 2.9.10. (diff)
- Update lang/python32 to 3.2.6 [1]
- Update lang/python35 to 3.5.1 [2] - Update lang/python-doc-html for [1] - Switch to do-test Changelog: [1] https://hg.python.org/cpython/file/v3.2.6/Misc/NEWS [2] https://docs.python.org/3.5/whatsnew/changelog.html#python-3-5-1-final Reviewed by: koobs (python) Approved by: mat (mentor) Differential Revision: D4663
Notes
Notes: svn path=/head/; revision=404141
Diffstat (limited to 'lang/python32/files/patch-CVE-2014-1912')
-rw-r--r--lang/python32/files/patch-CVE-2014-191249
1 files changed, 0 insertions, 49 deletions
diff --git a/lang/python32/files/patch-CVE-2014-1912 b/lang/python32/files/patch-CVE-2014-1912
deleted file mode 100644
index a23eba9a8042..000000000000
--- a/lang/python32/files/patch-CVE-2014-1912
+++ /dev/null
@@ -1,49 +0,0 @@
-# HG changeset patch
-# User Benjamin Peterson <benjamin@python.org>
-# Date 1389671978 18000
-# Node ID 9c56217e5c793685eeaf0ee224848c402bdf1e4c
-# Parent 2b5cd6d4d149dea6c6941b7e07ada248b29fc9f6
-complain when nbytes > buflen to fix possible buffer overflow (closes #20246)
-
-# HG changeset patch
-# User Stefan Krah <skrah@bytereef.org>
-# Date 1390341520 -3600
-# Node ID e82dcd700e8cfb174d6bf6031fd6666627b20f5f
-# Parent 29b1eebecb8ed946e1db8e4bb86310d681cf4a91
-Issue #20246: Fix test failures on FreeBSD. Patch by Ryan Smith-Roberts.
-
-diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
---- Lib/test/test_socket.py
-+++ Lib/test/test_socket.py
-@@ -1968,6 +1968,14 @@ class BufferIOTest(SocketConnectedTest):
-
- _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)
-+
-
- TIPC_STYPE = 2000
- TIPC_LOWER = 200
-
-diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
---- Modules/socketmodule.c
-+++ Modules/socketmodule.c
-@@ -2598,6 +2598,11 @@ sock_recvfrom_into(PySocketSockObject *s
- 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);
-