summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2007-05-16 20:05:11 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2007-05-16 20:05:11 (GMT)
commitb1a9b37aa836f1c0f827b16cebdd23dfe19fcf4c (patch)
treef69f0ae562a44947f5734763f19f6101df6477b6 /Misc
parentf1135f30f8c2b6d1d6a875135de37d04c030e071 (diff)
downloadcpython-b1a9b37aa836f1c0f827b16cebdd23dfe19fcf4c.zip
cpython-b1a9b37aa836f1c0f827b16cebdd23dfe19fcf4c.tar.gz
cpython-b1a9b37aa836f1c0f827b16cebdd23dfe19fcf4c.tar.bz2
Fix bug in marshal where bad data would cause a segfault due to
lack of an infinite recursion check. Contributed by Damien Miller at Google.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index b47ec6e..b0a0372 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -429,6 +429,7 @@ Dieter Maurer
Greg McFarlane
Michael McLay
Gordon McMillan
+Damien Miller
Jay T. Miller
Chris McDonough
Andrew McNamara
diff --git a/Misc/NEWS b/Misc/NEWS
index 1b3e1d9..eefa181 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -207,6 +207,9 @@ Core and builtins
Library
-------
+- Fix bug in marshal where bad data would cause a segfault due to
+ lack of an infinite recursion check.
+
- Removed plat-freebsd2 and plat-freebsd3 directories (and IN.py in
the directories).