summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-05-10 22:10:27 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-05-10 22:10:27 (GMT)
commitf188bc5d4618103bd86a49a6b473e4a86e6b22b7 (patch)
treec37719be16c95847c93031692424c3a69ff255ae /Misc
parentccc87b53dba9ca3558ce8d333d9eb9274c16b0f4 (diff)
parent136726537ffd92b0f3e8dabb23023ed514852e2e (diff)
downloadcpython-f188bc5d4618103bd86a49a6b473e4a86e6b22b7.zip
cpython-f188bc5d4618103bd86a49a6b473e4a86e6b22b7.tar.gz
cpython-f188bc5d4618103bd86a49a6b473e4a86e6b22b7.tar.bz2
#12051: merge with 3.1.
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 ac9ac79..fdac4a2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -342,6 +342,9 @@ Tools/Demos
Extension Modules
-----------------
+- Issue #12051: Fix segfault in json.dumps() while encoding highly-nested
+ objects using the C accelerations.
+
- Issue #12017: Fix segfault in json.loads() while decoding highly-nested
objects using the C accelerations.