summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-04-14 02:31:42 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-04-14 02:31:42 (GMT)
commit584f5cbf16980f21c58bf7ce7e451e022355fa3d (patch)
tree5fb3623c73a49499d71d382723c283f3b83a8478 /Misc
parentd5aa487cceac54fdf2b5c073157b899b3c8c9c94 (diff)
parent156285c35f8ff856883f09394653b000331e3e33 (diff)
downloadcpython-584f5cbf16980f21c58bf7ce7e451e022355fa3d.zip
cpython-584f5cbf16980f21c58bf7ce7e451e022355fa3d.tar.gz
cpython-584f5cbf16980f21c58bf7ce7e451e022355fa3d.tar.bz2
merge 3.3
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index f1ed07c..a19a68f 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1372,6 +1372,7 @@ Johannes Vogel
Alex Volkov
Martijn Vries
Sjoerd de Vries
+Guido Vranken
Niki W. Waibel
Wojtek Walczak
Charles Waldman
diff --git a/Misc/NEWS b/Misc/NEWS
index 74c5e50..6fc6e2f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,9 @@ Core and Builtins
Library
-------
+- 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
replace error handler.