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

lioncash · serhiy-storchaka · commit f76231f89a72 · 2017-11-13T09:50:16.000+02:00
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
@@ -1777,8 +1777,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,
@@ -1789,6 +1791,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) {

Original file line number	Diff line number	Diff line change
`@@ -1777,8 +1777,10 @@ fast_save_enter(PicklerObject self, PyObject obj)`
`1777`	`1777`	`}`
`1778`	`1778`	`}`
`1779`	`1779`	`key = PyLong_FromVoidPtr(obj);`
`1780`		`- if (key == NULL)`
	`1780`	`+ if (key == NULL) {`
	`1781`	`+ self->fast_nesting = -1;`
`1781`	`1782`	`return 0;`
	`1783`	`+ }`
`1782`	`1784`	`if (PyDict_GetItemWithError(self->fast_memo, key)) {`
`1783`	`1785`	`Py_DECREF(key);`
`1784`	`1786`	`PyErr_Format(PyExc_ValueError,`
`@@ -1789,6 +1791,8 @@ fast_save_enter(PicklerObject self, PyObject obj)`
`1789`	`1791`	`return 0;`
`1790`	`1792`	`}`
`1791`	`1793`	`if (PyErr_Occurred()) {`
	`1794`	`+ Py_DECREF(key);`
	`1795`	`+ self->fast_nesting = -1;`
`1792`	`1796`	`return 0;`
`1793`	`1797`	`}`
`1794`	`1798`	`if (PyDict_SetItem(self->fast_memo, key, Py_None) < 0) {`