Issue #7455: Fix possible crash in cPickle on invalid input. Patch by
Florent Xicluna.
diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py
index 04bb842..0bdcc10 100644
--- a/Lib/test/pickletester.py
+++ b/Lib/test/pickletester.py
@@ -1100,6 +1100,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 274b150..199680e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -65,6 +65,9 @@
Library
-------
+- Issue #7455: Fix possible crash in cPickle on invalid input. Patch by
+ Florent Xicluna.
+
- Issue #7092: Fix the DeprecationWarnings emitted by the standard library
when using the -3 flag. Patch by Florent Xicluna.
diff --git a/Modules/cPickle.c b/Modules/cPickle.c
index f97959b..7fa7f70 100644
--- a/Modules/cPickle.c
+++ b/Modules/cPickle.c
@@ -4117,7 +4117,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;