summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-01-07 17:57:31 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-01-07 17:57:31 (GMT)
commit01a15ea2b622e38f5b53bc2debee0fa54bf1fbd2 (patch)
treeb15969861da0b40d720c65868048c350cf2ed9e2 /Lib
parent0bc8f907eff9585d0220d1f3ef7120644a7c9c9d (diff)
downloadcpython-01a15ea2b622e38f5b53bc2debee0fa54bf1fbd2.zip
cpython-01a15ea2b622e38f5b53bc2debee0fa54bf1fbd2.tar.gz
cpython-01a15ea2b622e38f5b53bc2debee0fa54bf1fbd2.tar.bz2
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 759c986..7ded8b6 100644
--- a/Lib/test/pickletester.py
+++ b/Lib/test/pickletester.py
@@ -1139,6 +1139,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):