diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-12-05 08:23:11 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-12-05 08:23:11 (GMT) |
| commit | 68524e1984bdc14f0158cdca9adf18e6b7fceb7a (patch) | |
| tree | 07184c1fdadf33779049d80189c0caaff85c6063 | |
| parent | 6d8a26084541522495fdf3fa00875c144ea3450b (diff) | |
| parent | 2deaea31194a8441bf5b7060f65d405c9e0584ce (diff) | |
| download | cpython-68524e1984bdc14f0158cdca9adf18e6b7fceb7a.zip cpython-68524e1984bdc14f0158cdca9adf18e6b7fceb7a.tar.gz cpython-68524e1984bdc14f0158cdca9adf18e6b7fceb7a.tar.bz2 | |
merge 3.3
| -rw-r--r-- | Misc/NEWS | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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 |