summaryrefslogtreecommitdiffstats
path: root/Objects/genericaliasobject.c
diff options
context:
space:
mode:
authorIonite <dev@ionite.io>2023-02-24 23:02:04 (GMT)
committerGitHub <noreply@github.com>2023-02-24 23:02:04 (GMT)
commit54dfa14c5a94b893b67a4d9e9e403ff538ce9023 (patch)
tree1b8e158aa5869aeb24749ebcd7390afdd114994e /Objects/genericaliasobject.c
parent89b4c1205327cc8032f4a39e3dfbdb59009a0704 (diff)
downloadcpython-54dfa14c5a94b893b67a4d9e9e403ff538ce9023.zip
cpython-54dfa14c5a94b893b67a4d9e9e403ff538ce9023.tar.gz
cpython-54dfa14c5a94b893b67a4d9e9e403ff538ce9023.tar.bz2
gh-101765: Fix SystemError / segmentation fault in iter `__reduce__` when internal access of `builtins.__dict__` exhausts the iterator (#101769)
Diffstat (limited to 'Objects/genericaliasobject.c')
-rw-r--r--Objects/genericaliasobject.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/Objects/genericaliasobject.c b/Objects/genericaliasobject.c
index 675fd49..888cb16 100644
--- a/Objects/genericaliasobject.c
+++ b/Objects/genericaliasobject.c
@@ -877,8 +877,17 @@ ga_iter_clear(PyObject *self) {
static PyObject *
ga_iter_reduce(PyObject *self, PyObject *Py_UNUSED(ignored))
{
+ PyObject *iter = _PyEval_GetBuiltin(&_Py_ID(iter));
gaiterobject *gi = (gaiterobject *)self;
- return Py_BuildValue("N(O)", _PyEval_GetBuiltin(&_Py_ID(iter)), gi->obj);
+
+ /* _PyEval_GetBuiltin can invoke arbitrary code,
+ * call must be before access of iterator pointers.
+ * see issue #101765 */
+
+ if (gi->obj)
+ return Py_BuildValue("N(O)", iter, gi->obj);
+ else
+ return Py_BuildValue("N(())", iter);
}
static PyMethodDef ga_iter_methods[] = {