From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 22 Aug 2018 05:54:39 +0000 (-0400)
Subject: bpo-34456: pickle: Add missing NULL check to save_global(). (GH-8851)
X-Git-Tag: v3.6.7rc1~93
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b14a68fd7d8f02bd133b59709f969c1c564f5978;p=thirdparty%2FPython%2Fcpython.git

bpo-34456: pickle: Add missing NULL check to save_global(). (GH-8851)


Reported by Svace static analyzer.
(cherry picked from commit f8c06b028036e50596e75d4c9f6b27ba05133efe)

Co-authored-by: Alexey Izbyshev <izbyshev@ispras.ru>
---

diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index 10c8371d6740..f5202f50c547 100644
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -3349,6 +3349,8 @@ save_global(PicklerObject *self, PyObject *obj, PyObject *name)
             PickleState *st = _Pickle_GetGlobalState();
             PyObject *reduce_value = Py_BuildValue("(O(OO))",
                                         st->getattr, parent, lastname);
+            if (reduce_value == NULL)
+                goto error;
             status = save_reduce(self, reduce_value, NULL);
             Py_DECREF(reduce_value);
             if (status < 0)