[Python-checkins] cpython (merge 2.7 -> 2.7): merge 2.7.11 branch

[benjamin.peterson]

https://hg.python.org/cpython/rev/a3aa22a55db3
changeset:   99450:a3aa22a55db3
branch:      2.7
parent:      99428:c4e950338e79
parent:      99449:b2d64aff7225
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Dec 05 00:18:11 2015 -0800
summary:
  merge 2.7.11 branch

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
@@ -1406,8 +1406,9 @@
 - Issue #21349: Passing a memoryview to _winreg.SetValueEx now correctly raises
   a TypeError where it previously crashed the interpreter. Patch by Brian Kearns
 
-- 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 #21172: isinstance check relaxed from dict to collections.Mapping.
 

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