summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-04-23 21:06:45 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-04-23 21:06:45 (GMT)
commita30e2256f70bd43255e8dae6459c70540f118b62 (patch)
treef16541ea402882378ae4b6153d2db9d15b63303c /Misc
parentc314e28766fb58451488b38abdabc6161715e407 (diff)
parentbd91ee9cd78ac41ae37ffb06c4d711848cdf4bb0 (diff)
downloadcpython-a30e2256f70bd43255e8dae6459c70540f118b62.zip
cpython-a30e2256f70bd43255e8dae6459c70540f118b62.tar.gz
cpython-a30e2256f70bd43255e8dae6459c70540f118b62.tar.bz2
merge 3.4 (#24044)
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 974e9ca..4f702d0 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -78,6 +78,9 @@ Core and Builtins
- Issue #23466: %c, %o, %x, and %X in bytes formatting now raise TypeError on
non-integer input.
+- Issue #24044: Fix possible null pointer dereference in list.sort in out of
+ memory conditions.
+
Library
-------