[Python-checkins] cpython (merge 3.3 -> 3.4): merge 3.3
benjamin.peterson
python-checkins at python.org
Sat Dec 5 03:24:30 EST 2015
https://hg.python.org/cpython/rev/693d0b030626
changeset: 99453:693d0b030626
branch: 3.4
parent: 99446:fae5186562d0
parent: 99452:2932933afbe1
user: Benjamin Peterson <benjamin at python.org>
date: Sat Dec 05 00:23:11 2015 -0800
summary:
merge 3.3
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
@@ -1841,8 +1841,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
More information about the Python-checkins
mailing list