summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2016-01-21 06:25:06 (GMT)
committerBenjamin Peterson <benjamin@python.org>2016-01-21 06:25:06 (GMT)
commit47b8ba22e304fa136563c803f5f0cc589e8be1ac (patch)
treeec367ffa5e950c78580061122983de29fe3d12b0 /Misc
parentd4d7737c3f294d745d6c121dabb17b76cc11b9c8 (diff)
parentc4032da2012d75c6c358f74d8bf9ee98a7fe8ecf (diff)
downloadcpython-47b8ba22e304fa136563c803f5f0cc589e8be1ac.zip
cpython-47b8ba22e304fa136563c803f5f0cc589e8be1ac.tar.gz
cpython-47b8ba22e304fa136563c803f5f0cc589e8be1ac.tar.bz2
merge 3.4 (#26171)
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 4baf757..dc375d0 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -50,6 +50,9 @@ Core and Builtins
__bytes__, __trunc__, and __float__ returning instances of subclasses of
bytes, int, and float to subclasses of bytes, int, and float correspondingly.
+- Issue #26171: Fix possible integer overflow and heap corruption in
+ zipimporter.get_data().
+
Library
-------