From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 29 Sep 2018 06:01:48 +0000 (-0700)
Subject: Fix incorrect error handling in _pickle.Unpickler.__init__() (GH-9630)
X-Git-Tag: v3.7.1rc2~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=758ad54dac6360657173d1c56f60510e5cdd08b6;p=thirdparty%2FPython%2Fcpython.git

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@gmail.com>
---

diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index 34ce38c5d3b2..ba8962d686de 100644
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -6804,7 +6804,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);