merge 3.3

1fec674d · Benjamin Peterson · 81eaa142 · dc1f72e2 · 1fec674d
Commit 1fec674d authored Dec 05, 2015 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

Misc/NEWS Misc/NEWS +3 -2

No files found.
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1841,8 +1841,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