summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorMatthias Klose <doko@ubuntu.com>2010-10-17 10:28:49 (GMT)
committerMatthias Klose <doko@ubuntu.com>2010-10-17 10:28:49 (GMT)
commit192b714f92de2f08397dba32f6a831b29cce2229 (patch)
tree62f4defc69173be2edddd9a1d7bb09db6ecece60 /Misc
parentb3b56fcfcb88a5643e3e7c4aa2ab7418166f563c (diff)
downloadcpython-192b714f92de2f08397dba32f6a831b29cce2229.zip
cpython-192b714f92de2f08397dba32f6a831b29cce2229.tar.gz
cpython-192b714f92de2f08397dba32f6a831b29cce2229.tar.bz2
Merged revisions 81046 from the python2.6 branch:
Issue #8674: Fix incorrect and UB-inducing overflow checks in audioop module. Thanks Tomas Hoger for the patch.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS6
2 files changed, 7 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index dddc40d..2184367 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -288,6 +288,7 @@ Joerg-Cyril Hoehle
Gregor Hoffleit
Chris Hoffman
Albert Hofkamp
+Tomas Hoger
Jonathan Hogg
Gerrit Holl
Rune Holm
diff --git a/Misc/NEWS b/Misc/NEWS
index d5de2c0..c9b3b9c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -9,6 +9,12 @@ What's New in Python 2.5.6c1?
*Release date: XX-XXX-2010*
+Library
+-------
+
+- Issue #8674: Fixed a number of incorrect or undefined-behaviour-inducing
+ overflow checks in the audioop module (CVE-2010-1634).
+
What's New in Python 2.5.5?
===========================