From 51a346d0753c52cc1ab3fef9b35c9ded3fddb325 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Thu, 5 Jul 2018 03:44:11 -0700 Subject: [PATCH] Fix fuzz testing for marshal.loads(). (GH-8106) (cherry picked from commit 09bb918a61031377d720f1a0fa1fe53c962791b6) Co-authored-by: Serhiy Storchaka --- Lib/test/test_marshal.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_marshal.py b/Lib/test/test_marshal.py index a20ad677c87..a3bd350c77b 100644 --- a/Lib/test/test_marshal.py +++ b/Lib/test/test_marshal.py @@ -192,8 +192,8 @@ class BugsTestCase(unittest.TestCase): marshal.dumps([128] * 1000) def test_patch_873224(self): - self.assertRaises(Exception, marshal.loads, '0') - self.assertRaises(Exception, marshal.loads, 'f') + self.assertRaises(Exception, marshal.loads, b'0') + self.assertRaises(Exception, marshal.loads, b'f') self.assertRaises(Exception, marshal.loads, marshal.dumps(2**65)[:-1]) def test_version_argument(self): @@ -204,7 +204,8 @@ class BugsTestCase(unittest.TestCase): def test_fuzz(self): # simple test that it's at least not *totally* trivial to # crash from bad marshal data - for c in [chr(i) for i in range(256)]: + for i in range(256): + c = bytes([i]) try: marshal.loads(c) except Exception: @@ -318,7 +319,7 @@ class BugsTestCase(unittest.TestCase): self.assertRaises(ValueError, marshal.load, BadReader(marshal.dumps(value))) - def _test_eof(self): + def test_eof(self): data = marshal.dumps(("hello", "dolly", None)) for i in range(len(data)): self.assertRaises(EOFError, marshal.loads, data[0: i])