summaryrefslogtreecommitdiffstats
path: root/Lib/test/pickletester.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-01-07 17:46:49 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-01-07 17:46:49 (GMT)
commit0d423b870b0669e7a47aca2739f89e96652546ce (patch)
treef79be272e08e3e2344e6ec7a48b040365935a816 /Lib/test/pickletester.py
parentbdd863d0621fdd4e16ff9f9fc1f7ed5fef432721 (diff)
downloadcpython-0d423b870b0669e7a47aca2739f89e96652546ce.zip
cpython-0d423b870b0669e7a47aca2739f89e96652546ce.tar.gz
cpython-0d423b870b0669e7a47aca2739f89e96652546ce.tar.bz2
Issue #7455: Fix possible crash in cPickle on invalid input. Patch by
Florent Xicluna.
Diffstat (limited to 'Lib/test/pickletester.py')
-rw-r--r--Lib/test/pickletester.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py
index 04bb842..0bdcc10 100644
--- a/Lib/test/pickletester.py
+++ b/Lib/test/pickletester.py
@@ -1100,6 +1100,15 @@ class AbstractPickleModuleTests(unittest.TestCase):
exec teststr in {'__builtins__': builtins}, d
d['f']()
+ def test_bad_input(self):
+ # Test issue4298
+ s = '\x58\0\0\0\x54'
+ self.assertRaises(EOFError, self.module.loads, s)
+ # Test issue7455
+ s = '0'
+ # XXX Why doesn't pickle raise UnpicklingError?
+ self.assertRaises((IndexError, cPickle.UnpicklingError),
+ self.module.loads, s)
class AbstractPersistentPicklerTests(unittest.TestCase):