| commit | 74b301678315068f4e1283fadcc5232cc94426ca | [log] [tgz] |
|---|---|---|
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | Thu Jul 23 19:26:02 2009 +0000 |
| committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | Thu Jul 23 19:26:02 2009 +0000 |
| tree | 82d97fa060675f230739859b2f800b47b6afae3a | |
| parent | 617a5588d1e5d0ad4cf791646c053064df74aea2 [diff] [blame] |
#6553: crash in cPickle.load(), when given a StringIO with incomplete data. Will backport to 2.6, 3.x already fixed a similar issue with issue4298.
diff --git a/Modules/cPickle.c b/Modules/cPickle.c index 486e86f..a849424 100644 --- a/Modules/cPickle.c +++ b/Modules/cPickle.c
@@ -663,6 +663,12 @@ self->last_string = str; if (! (*s = PyString_AsString(str))) return -1; + + if (PyString_GET_SIZE(str) != n) { + PyErr_SetNone(PyExc_EOFError); + return -1; + } + return n; }