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!
........
diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py
index c22085a..2454af1 100644
--- a/Lib/test/pickletester.py
+++ b/Lib/test/pickletester.py
@@ -1029,6 +1029,15 @@
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):
diff --git a/Misc/NEWS b/Misc/NEWS
index dbdf47a..85faf59 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -48,6 +48,9 @@
Library
-------
+- Issue #7455: Fix possible crash in cPickle on invalid input. Patch by
+ Victor Stinner.
+
- Issue #6511: ZipFile now raises BadZipfile (instead of an IOError) when
opening an empty or very small file.
diff --git a/Modules/cPickle.c b/Modules/cPickle.c
index 4e53ae6..331fca2 100644
--- a/Modules/cPickle.c
+++ b/Modules/cPickle.c
@@ -4033,7 +4033,7 @@
*/
if (self->num_marks > 0 && self->marks[self->num_marks - 1] == len) {
self->num_marks--;
- } else if (len >= 0) {
+ } else if (len > 0) {
len--;
Py_DECREF(self->stack->data[len]);
self->stack->length = len;