summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-12-05 08:21:12 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-12-05 08:21:12 (GMT)
commit2deaea31194a8441bf5b7060f65d405c9e0584ce (patch)
tree1bc8391f6f85ee0651e8976730fc68a8a7b321cb
parent102764a1f6927955b9a907005ffd07216ebe1d96 (diff)
parent5e621176c4ec3cbd5102b9ca7441695832544123 (diff)
downloadcpython-2deaea31194a8441bf5b7060f65d405c9e0584ce.zip
cpython-2deaea31194a8441bf5b7060f65d405c9e0584ce.tar.gz
cpython-2deaea31194a8441bf5b7060f65d405c9e0584ce.tar.bz2
merge 3.2
-rw-r--r--Misc/NEWS7
1 files changed, 4 insertions, 3 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index c5d7e65..fd04cd1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -47,6 +47,10 @@ Library
- Issue #23365: Fixed possible integer overflow in
itertools.combinations_with_replacement.
+- Issue #21529 (CVE-2014-4616): Fix arbitrary memory access in
+ JSONDecoder.raw_decode with a negative second parameter. Bug reported by Guido
+ Vranken.
+
C API
-----
@@ -97,9 +101,6 @@ Library
- Issue #21766: Prevent a security hole in CGIHTTPServer by URL unquoting paths
before checking for a CGI script at that path.
-- Fix arbitrary memory access in JSONDecoder.raw_decode with a negative second
- parameter. Bug reported by Guido Vranken.
-
- Issue #20633: Replace relative import by absolute import.
- Issue #21082: In os.makedirs, do not set the process-wide umask. Note this