mirror of https://github.com/python/cpython
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! ........
This commit is contained in:
parent
a507072e54
commit
8dba727ce8
|
@ -1029,6 +1029,15 @@ class AbstractPickleModuleTests(unittest.TestCase):
|
||||||
exec teststr in {'__builtins__': builtins}, d
|
exec teststr in {'__builtins__': builtins}, d
|
||||||
d['f']()
|
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):
|
class AbstractPersistentPicklerTests(unittest.TestCase):
|
||||||
|
|
||||||
|
|
|
@ -48,6 +48,9 @@ Core and Builtins
|
||||||
Library
|
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
|
- Issue #6511: ZipFile now raises BadZipfile (instead of an IOError) when
|
||||||
opening an empty or very small file.
|
opening an empty or very small file.
|
||||||
|
|
||||||
|
|
|
@ -4033,7 +4033,7 @@ load_pop(Unpicklerobject *self)
|
||||||
*/
|
*/
|
||||||
if (self->num_marks > 0 && self->marks[self->num_marks - 1] == len) {
|
if (self->num_marks > 0 && self->marks[self->num_marks - 1] == len) {
|
||||||
self->num_marks--;
|
self->num_marks--;
|
||||||
} else if (len >= 0) {
|
} else if (len > 0) {
|
||||||
len--;
|
len--;
|
||||||
Py_DECREF(self->stack->data[len]);
|
Py_DECREF(self->stack->data[len]);
|
||||||
self->stack->length = len;
|
self->stack->length = len;
|
||||||
|
|
Loading…
Reference in New Issue