mirror of
https://github.com/python/cpython.git
synced 2025-10-10 00:43:41 +00:00
gh-101765: Fix SystemError / segmentation fault in iter __reduce__
when internal access of builtins.__dict__
exhausts the iterator (#101769)
This commit is contained in:
parent
89b4c12053
commit
54dfa14c5a
9 changed files with 148 additions and 23 deletions
|
@ -1048,11 +1048,16 @@ PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(
|
|||
static PyObject *
|
||||
tupleiter_reduce(_PyTupleIterObject *it, PyObject *Py_UNUSED(ignored))
|
||||
{
|
||||
PyObject *iter = _PyEval_GetBuiltin(&_Py_ID(iter));
|
||||
|
||||
/* _PyEval_GetBuiltin can invoke arbitrary code,
|
||||
* call must be before access of iterator pointers.
|
||||
* see issue #101765 */
|
||||
|
||||
if (it->it_seq)
|
||||
return Py_BuildValue("N(O)n", _PyEval_GetBuiltin(&_Py_ID(iter)),
|
||||
it->it_seq, it->it_index);
|
||||
return Py_BuildValue("N(O)n", iter, it->it_seq, it->it_index);
|
||||
else
|
||||
return Py_BuildValue("N(())", _PyEval_GetBuiltin(&_Py_ID(iter)));
|
||||
return Py_BuildValue("N(())", iter);
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue