diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-12-05 08:24:01 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-12-05 08:24:01 (GMT) |
| commit | c98bbd52896140821414d412949e9540b75a5371 (patch) | |
| tree | b9a07c129d176d6dea0d3bcef34bc61ca5a27b40 | |
| parent | 2356069d94ace825895028a85e07959e6f7fda35 (diff) | |
| parent | 68524e1984bdc14f0158cdca9adf18e6b7fceb7a (diff) | |
| download | cpython-c98bbd52896140821414d412949e9540b75a5371.zip cpython-c98bbd52896140821414d412949e9540b75a5371.tar.gz cpython-c98bbd52896140821414d412949e9540b75a5371.tar.bz2 | |
merge 3.4
| -rw-r--r-- | Misc/NEWS | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -3062,8 +3062,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 |