summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2017-11-13 08:19:52 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2017-11-13 08:19:52 (GMT)
commit6ed9d4ecde8c3f0eeadf188f15a5bbd32b9d1145 (patch)
tree8c4ed22a069f1dfb9ffbabf4ec804b9afb46976e
parentad004f9b5a581f577374c56d8ab27e9ef2e73452 (diff)
downloadcpython-6ed9d4ecde8c3f0eeadf188f15a5bbd32b9d1145.zip
cpython-6ed9d4ecde8c3f0eeadf188f15a5bbd32b9d1145.tar.gz
cpython-6ed9d4ecde8c3f0eeadf188f15a5bbd32b9d1145.tar.bz2
bpo-32013: _pickle: Add missing Py_DECREF in error case in fast_save_enter() (GH-4384) (#4385)
(cherry picked from commit f76231f89a7231fd486b37f728fbb4aab389e4d7)
-rw-r--r--Modules/_pickle.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index bc1af54..198474d 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) {