[Python-checkins] cpython (merge 3.4 -> 3.5): merge 3.4

[benjamin.peterson]

https://hg.python.org/cpython/rev/7984aea3a5e2
changeset:   99454:7984aea3a5e2
branch:      3.5
parent:      99447:de4108db61f7
parent:      99453:693d0b030626
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Dec 05 00:24:01 2015 -0800
summary:
  merge 3.4

files:
  Misc/NEWS |  5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -3062,8 +3062,9 @@
 - 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

-- 
Repository URL: https://hg.python.org/cpython