diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-09-27 08:16:12 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-09-27 08:16:12 (GMT) |
| commit | bdb93c3e638a1b8191d68052b3cea2a0475bc530 (patch) | |
| tree | 6c6d0e72e92150fbbe7c9522e0370dbea3f6edd5 /Modules | |
| parent | d330822c12c279b2a89af00bf899a64559eeadb3 (diff) | |
| parent | 6aa1564e9cdc89d97ede740d65af4c61968d4725 (diff) | |
| download | cpython-bdb93c3e638a1b8191d68052b3cea2a0475bc530.zip cpython-bdb93c3e638a1b8191d68052b3cea2a0475bc530.tar.gz cpython-bdb93c3e638a1b8191d68052b3cea2a0475bc530.tar.bz2 | |
merge 3.4 (#25245)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_pickle.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/_pickle.c b/Modules/_pickle.c index c3f1896..123f14b 100644 --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -1193,6 +1193,7 @@ _Unpickler_Read(UnpicklerObject *self, char **s, Py_ssize_t n) { Py_ssize_t num_read; + *s = NULL; if (self->next_read_idx > PY_SSIZE_T_MAX - n) { PickleState *st = _Pickle_GetGlobalState(); PyErr_SetString(st->UnpicklingError, |