commit dc78cc6f7cea2040114a350aa9db835cc433ae05
author Neal Norwitz <nnorwitz@gmail.com> Wed May 16 20:09:36 2007 +0000
committer Neal Norwitz <nnorwitz@gmail.com> Wed May 16 20:09:36 2007 +0000
tree d8bdc5a50aec44c2cb4e368dcc503bde2d55e92e
parent 4043a6bbd64a2dc46c20784c1f813b4d38c8c94a

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.

Lib/test/test_marshal.py

diff --git a/Lib/test/test_marshal.py b/Lib/test/test_marshal.py
index f87495b..bfdd274 100644
--- a/Lib/test/test_marshal.py
+++ b/Lib/test/test_marshal.py
@@ -220,6 +220,10 @@
             except Exception:
                 pass
 
+    def test_recursion(self):
+        s = 'c' + ('X' * 4*4) + '{' * 2**20
+        self.assertRaises(ValueError, marshal.loads, s)
+
 def test_main():
     test_support.run_unittest(IntTestCase,
                               FloatTestCase,