summaryrefslogtreecommitdiff
path: root/dev-lang/python/files/python-3.2-CVE-2014-1912.patch
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2015-08-09 10:43:34 +0200
committerMichał Górny <mgorny@gentoo.org>2015-08-09 10:47:50 +0200
commit33cf38e4f1eb6b456df0874b34ff54a8961cf97e (patch)
tree41777587297a3b0614b5f2dd2deb5c727b53b228 /dev-lang/python/files/python-3.2-CVE-2014-1912.patch
parentafad29a8b43f1ccf53f95e95a9b12e430183f8bb (diff)
downloadgentoo-33cf38e4f1eb6b456df0874b34ff54a8961cf97e.tar.gz
gentoo-33cf38e4f1eb6b456df0874b34ff54a8961cf97e.tar.bz2
gentoo-33cf38e4f1eb6b456df0874b34ff54a8961cf97e.zip
Move 3.2 to ::python. Remove old patches.
Package-Manager: portage-2.2.20
Diffstat (limited to 'dev-lang/python/files/python-3.2-CVE-2014-1912.patch')
-rw-r--r--dev-lang/python/files/python-3.2-CVE-2014-1912.patch51
1 files changed, 0 insertions, 51 deletions
diff --git a/dev-lang/python/files/python-3.2-CVE-2014-1912.patch b/dev-lang/python/files/python-3.2-CVE-2014-1912.patch
deleted file mode 100644
index 0e095074a259..000000000000
--- a/dev-lang/python/files/python-3.2-CVE-2014-1912.patch
+++ /dev/null
@@ -1,51 +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)
-
-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
-@@ -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*2048)
-+
-
- TIPC_STYPE = 2000
- TIPC_LOWER = 200
-diff --git a/Misc/ACKS b/Misc/ACKS
---- a/Misc/ACKS
-+++ b/Misc/ACKS
-@@ -1020,6 +1020,7 @@ Eric V. Smith
- Christopher Smith
- Gregory P. Smith
- Roy Smith
-+Ryan Smith-Roberts
- Rafal Smotrzyk
- Dirk Soede
- Paul Sokolovsky
-diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
---- a/Modules/socketmodule.c
-+++ b/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);