[Python-checkins] Fix incorrect error handling in _pickle.Unpickler.__init__() (GH-9630)
Miss Islington (bot)
webhook-mailer at python.org
Sat Sep 29 02:12:38 EDT 2018
https://github.com/python/cpython/commit/207bb5fda52c352d20be1ca4e7fc85cb513d7cf4
commit: 207bb5fda52c352d20be1ca4e7fc85cb513d7cf4
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2018-09-28T23:12:35-07:00
summary:
Fix incorrect error handling in _pickle.Unpickler.__init__() (GH-9630)
_pickle.Unpickler.__init__() should return -1 if Pdata_New() fails, not 1.
(cherry picked from commit 4b430e5f6954ef4b248e95bfb4087635dcdefc6d)
Co-authored-by: Zackery Spytz <zspytz at gmail.com>
files:
M Modules/_pickle.c
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index 93bc1c6fee7f..0a7e20e10592 100644
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -6713,7 +6713,7 @@ _pickle_Unpickler___init___impl(UnpicklerObject *self, PyObject *file,
self->stack = (Pdata *)Pdata_New();
if (self->stack == NULL)
- return 1;
+ return -1;
self->memo_size = 32;
self->memo = _Unpickler_NewMemo(self->memo_size);
More information about the Python-checkins
mailing list