merge 3.4 (#25245)

0c54b4af · Benjamin Peterson · 4f6d3a13 · e5361735 · 0c54b4af
Commit 0c54b4af authored Sep 27, 2015 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

Modules/_pickle.c Modules/_pickle.c +1 -0

No files found.
--- 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,