summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-01-14 04:12:55 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-01-14 04:12:55 (GMT)
commit5688222907583833837f2f0e92205f17fb92d436 (patch)
tree97f45bbb2e1003b76bfe4edb05a61b5a28220cd5 /Misc
parent80602e0e1b543d9f1e08fced125b0ea6c67cdf4b (diff)
parentfbf648ebba32bbc5aa571a4b09e2062a65fd2492 (diff)
downloadcpython-5688222907583833837f2f0e92205f17fb92d436.zip
cpython-5688222907583833837f2f0e92205f17fb92d436.tar.gz
cpython-5688222907583833837f2f0e92205f17fb92d436.tar.bz2
merge 3.2 (#20246)
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index cea4bed..e2c1917 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1169,6 +1169,7 @@ Eric V. Smith
Gregory P. Smith
Mark Smith
Roy Smith
+Ryan Smith-Roberts
Rafal Smotrzyk
Eric Snow
Dirk Soede
diff --git a/Misc/NEWS b/Misc/NEWS
index 361ed4e..eada667 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -46,6 +46,8 @@ Library
- Issue #20242: Fixed basicConfig() format strings for the alternative
formatting styles. Thanks to kespindler for the bug report and patch.
+- Issue #20246: Fix buffer overflow in socket.recvfrom_into.
+
- Issues #20206 and #5803: Fix edge case in email.quoprimime.encode where it
truncated lines ending in a character needing encoding but no newline by
using a more efficient algorithm that doesn't have the bug.