From e97ddc60c05e94f3d49c0721c8ba025f7269579c Mon Sep 17 00:00:00 2001 From: Jelle Zijlstra Date: Sat, 25 Feb 2023 16:01:58 -0800 Subject: [PATCH] [3.11] gh-101765: Fix refcount issues in list and unicode pickling (GH-102265) Followup from GH-101769.. (cherry picked from commit d71edbd1b7437706519a9786211597d95934331a) Co-authored-by: Jelle Zijlstra --- Objects/listobject.c | 8 ++++++++ Objects/unicodeobject.c | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Objects/listobject.c b/Objects/listobject.c index 0b20829a280ac1..0d4e4741fdf346 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -3459,16 +3459,24 @@ listiter_reduce_general(void *_it, int forward) /* the objects are not the same, index is of different types! */ if (forward) { PyObject *iter = _PyEval_GetBuiltin(&_Py_ID(iter)); + if (!iter) { + return NULL; + } listiterobject *it = (listiterobject *)_it; if (it->it_seq) { return Py_BuildValue("N(O)n", iter, it->it_seq, it->it_index); } + Py_DECREF(iter); } else { PyObject *reversed = _PyEval_GetBuiltin(&_Py_ID(reversed)); + if (!reversed) { + return NULL; + } listreviterobject *it = (listreviterobject *)_it; if (it->it_seq) { return Py_BuildValue("N(O)n", reversed, it->it_seq, it->it_index); } + Py_DECREF(reversed); } /* empty iterator, create an empty list */ list = PyList_New(0); diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 02343d7c93269b..9b8296ca6bb054 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -15767,8 +15767,10 @@ unicodeiter_reduce(unicodeiterobject *it, PyObject *Py_UNUSED(ignored)) return Py_BuildValue("N(O)n", iter, it->it_seq, it->it_index); } else { PyObject *u = (PyObject *)_PyUnicode_New(0); - if (u == NULL) + if (u == NULL) { + Py_DECREF(iter); return NULL; + } return Py_BuildValue("N(N)", iter, u); } }