summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-02-01 22:59:49 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-02-01 22:59:49 (GMT)
commit3675cd9db1d7eda965df81357a11dd40e41090f7 (patch)
tree7736103010ac82c41b4a51eb5c4121dca198fb74 /Misc
parent3a43d063213f221436ec00afca1d74b4a3b28c15 (diff)
parente3bfe19358f9d6747676fcdb9af415972d276671 (diff)
downloadcpython-3675cd9db1d7eda965df81357a11dd40e41090f7.zip
cpython-3675cd9db1d7eda965df81357a11dd40e41090f7.tar.gz
cpython-3675cd9db1d7eda965df81357a11dd40e41090f7.tar.bz2
merge 3.3 (#23369)
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS3
1 files changed, 3 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index f051864..84378ea 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -50,6 +50,9 @@ Core and Builtins
Library
-------
+- Issue #23369: Fixed possible integer overflow in
+ _json.encode_basestring_ascii.
+
- Issue #23353: Fix the exception handling of generators in
PyEval_EvalFrameEx(). At entry, save or swap the exception state even if
PyEval_EvalFrameEx() is called with throwflag=0. At exit, the exception state