summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-12-05 08:24:10 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-12-05 08:24:10 (GMT)
commit608916af240a92d4cd4fe9793e7449cc1f96c9cd (patch)
tree97dfd92e164c48bfb9289ba4e220a72a1da7393d /Misc
parent6dece97768c4cde32a42ac12b0195bf6f9073578 (diff)
parentc98bbd52896140821414d412949e9540b75a5371 (diff)
downloadcpython-608916af240a92d4cd4fe9793e7449cc1f96c9cd.zip
cpython-608916af240a92d4cd4fe9793e7449cc1f96c9cd.tar.gz
cpython-608916af240a92d4cd4fe9793e7449cc1f96c9cd.tar.bz2
merge 3.5
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS5
1 files changed, 3 insertions, 2 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 08bafea..eb467cb 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -3483,8 +3483,9 @@ Library
- Issue #20968: unittest.mock.MagicMock now supports division.
Patch by Johannes Baiter.
-- Fix arbitrary memory access in JSONDecoder.raw_decode with a negative second
- parameter. Bug reported by Guido Vranken.
+- Issue #21529 (CVE-2014-4616): Fix arbitrary memory access in
+ JSONDecoder.raw_decode with a negative second parameter. Bug reported by Guido
+ Vranken.
- Issue #21169: getpass now handles non-ascii characters that the
input stream encoding cannot encode by re-encoding using the