| commit | bdb93c3e638a1b8191d68052b3cea2a0475bc530 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Sun Sep 27 01:16:12 2015 -0700 |
| committer | Benjamin Peterson <benjamin@python.org> | Sun Sep 27 01:16:12 2015 -0700 |
| tree | 6c6d0e72e92150fbbe7c9522e0370dbea3f6edd5 | |
| parent | d330822c12c279b2a89af00bf899a64559eeadb3 [diff] | |
| parent | 6aa1564e9cdc89d97ede740d65af4c61968d4725 [diff] |
merge 3.4 (#25245)
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 @@ { 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,