From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Mon, 13 Nov 2017 08:19:52 +0000 (-0800)
Subject: bpo-32013: _pickle: Add missing Py_DECREF in error case in fast_save_enter() (GH... 
X-Git-Tag: v3.6.4rc1~73
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6ed9d4ecde8c3f0eeadf188f15a5bbd32b9d1145;p=python

bpo-32013: _pickle: Add missing Py_DECREF in error case in fast_save_enter() (GH-4384) (#4385)

(cherry picked from commit f76231f89a7231fd486b37f728fbb4aab389e4d7)
---

diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index bc1af54807..198474d88b 100644
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -1731,8 +1731,10 @@ fast_save_enter(PicklerObject *self, PyObject *obj)
             }
         }
         key = PyLong_FromVoidPtr(obj);
-        if (key == NULL)
+        if (key == NULL) {
+            self->fast_nesting = -1;
             return 0;
+        }
         if (PyDict_GetItemWithError(self->fast_memo, key)) {
             Py_DECREF(key);
             PyErr_Format(PyExc_ValueError,
@@ -1743,6 +1745,8 @@ fast_save_enter(PicklerObject *self, PyObject *obj)
             return 0;
         }
         if (PyErr_Occurred()) {
+            Py_DECREF(key);
+            self->fast_nesting = -1;
             return 0;
         }
         if (PyDict_SetItem(self->fast_memo, key, Py_None) < 0) {