diff options
| -rw-r--r-- | Lib/test/pickletester.py | 9 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/cPickle.c | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py index c22085ad5c..2454af13ed 100644 --- a/Lib/test/pickletester.py +++ b/Lib/test/pickletester.py @@ -1029,6 +1029,15 @@ class AbstractPickleModuleTests(unittest.TestCase): 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): @@ -48,6 +48,9 @@ Core and Builtins 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 4e53ae6722..331fca2f7c 100644 --- a/Modules/cPickle.c +++ b/Modules/cPickle.c @@ -4033,7 +4033,7 @@ load_pop(Unpicklerobject *self) */ 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; |