diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2020-07-13 12:49:26 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-13 12:49:26 (GMT) |
commit | 4f309abf55f0e6f8950ac13d6ec83c22b8d47bf8 (patch) | |
tree | 6be22b5ca19b7d7c9387bdc73096c03920ae8a58 /Lib/test/pickletester.py | |
parent | b0689ae7f9d904bc2126994aedbc552f03479e40 (diff) | |
download | cpython-4f309abf55f0e6f8950ac13d6ec83c22b8d47bf8.zip cpython-4f309abf55f0e6f8950ac13d6ec83c22b8d47bf8.tar.gz cpython-4f309abf55f0e6f8950ac13d6ec83c22b8d47bf8.tar.bz2 |
bpo-41288: Fix a crash in unpickling invalid NEWOBJ_EX. (GH-21458)
Automerge-Triggered-By: @tiran
Diffstat (limited to 'Lib/test/pickletester.py')
-rw-r--r-- | Lib/test/pickletester.py | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py index afbc2b3..fb972a3 100644 --- a/Lib/test/pickletester.py +++ b/Lib/test/pickletester.py @@ -1176,6 +1176,24 @@ class AbstractUnpickleTests(unittest.TestCase): self.assertIs(type(unpickled), collections.UserDict) self.assertEqual(unpickled, collections.UserDict({1: 2})) + def test_bad_reduce(self): + self.assertEqual(self.loads(b'cbuiltins\nint\n)R.'), 0) + self.check_unpickling_error(TypeError, b'N)R.') + self.check_unpickling_error(TypeError, b'cbuiltins\nint\nNR.') + + def test_bad_newobj(self): + error = (pickle.UnpicklingError, TypeError) + self.assertEqual(self.loads(b'cbuiltins\nint\n)\x81.'), 0) + self.check_unpickling_error(error, b'cbuiltins\nlen\n)\x81.') + self.check_unpickling_error(error, b'cbuiltins\nint\nN\x81.') + + def test_bad_newobj_ex(self): + error = (pickle.UnpicklingError, TypeError) + self.assertEqual(self.loads(b'cbuiltins\nint\n)}\x92.'), 0) + self.check_unpickling_error(error, b'cbuiltins\nlen\n)}\x92.') + self.check_unpickling_error(error, b'cbuiltins\nint\nN}\x92.') + self.check_unpickling_error(error, b'cbuiltins\nint\n)N\x92.') + def test_bad_stack(self): badpickles = [ b'.', # STOP |