summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-01-07 18:02:53 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-01-07 18:02:53 (GMT)
commit901d81e6724f7685199e669b808fce57a6123d87 (patch)
treec4b0b43272ed65092ea16363997a26e959c53c13 /Lib
parent93a59653a49d60abaeb69a966370b4277e0f1d3a (diff)
downloadcpython-901d81e6724f7685199e669b808fce57a6123d87.zip
cpython-901d81e6724f7685199e669b808fce57a6123d87.tar.gz
cpython-901d81e6724f7685199e669b808fce57a6123d87.tar.bz2
Merged revisions 77355 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r77355 | antoine.pitrou | 2010-01-07 18:57:31 +0100 (jeu., 07 janv. 2010) | 18 lines Merged revisions 77352-77354 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77352 | antoine.pitrou | 2010-01-07 18:46:49 +0100 (jeu., 07 janv. 2010) | 5 lines Issue #7455: Fix possible crash in cPickle on invalid input. Patch by Florent Xicluna. ........ r77353 | antoine.pitrou | 2010-01-07 18:49:37 +0100 (jeu., 07 janv. 2010) | 3 lines Fix attribution. Florent actually repackaged and reviewed Victor's patch (sorry!). ........ r77354 | antoine.pitrou | 2010-01-07 18:54:10 +0100 (jeu., 07 janv. 2010) | 3 lines Fix reattribution mistake when fixing attribution mistake! ........ ................
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/pickletester.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py
index 19704ae..7ecc105 100644
--- a/Lib/test/pickletester.py
+++ b/Lib/test/pickletester.py
@@ -1142,6 +1142,9 @@ class AbstractPickleModuleTests(unittest.TestCase):
# Test issue4298
s = bytes([0x58, 0, 0, 0, 0x54])
self.assertRaises(EOFError, pickle.loads, s)
+ # Test issue7455
+ s = b'0'
+ self.assertRaises(pickle.UnpicklingError, pickle.loads, s)
class AbstractPersistentPicklerTests(unittest.TestCase):