summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-12-05 08:24:01 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-12-05 08:24:01 (GMT)
commitc98bbd52896140821414d412949e9540b75a5371 (patch)
treeb9a07c129d176d6dea0d3bcef34bc61ca5a27b40 /Misc
parent2356069d94ace825895028a85e07959e6f7fda35 (diff)
parent68524e1984bdc14f0158cdca9adf18e6b7fceb7a (diff)
downloadcpython-c98bbd52896140821414d412949e9540b75a5371.zip
cpython-c98bbd52896140821414d412949e9540b75a5371.tar.gz
cpython-c98bbd52896140821414d412949e9540b75a5371.tar.bz2
merge 3.4
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 fc2797c..4399da2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -3062,8 +3062,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