From 1371295e678f00a7c89dc5bb2ab61ede9adbc094 Mon Sep 17 00:00:00 2001 From: Peter Bierma Date: Tue, 5 Nov 2024 04:56:36 -0500 Subject: gh-126366: Fix crash if `__iter__` raises an exception during `yield from` (#126369) --- Python/executor_cases.c.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Python/executor_cases.c.h') diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h index 9fac4e881b8..1d63402214d 100644 --- a/Python/executor_cases.c.h +++ b/Python/executor_cases.c.h @@ -3437,11 +3437,12 @@ else { /* `iterable` is not a generator. */ _PyFrame_SetStackPointer(frame, stack_pointer); - iter = PyStackRef_FromPyObjectSteal(PyObject_GetIter(iterable_o)); + PyObject *iter_o = PyObject_GetIter(iterable_o); stack_pointer = _PyFrame_GetStackPointer(frame); - if (PyStackRef_IsNull(iter)) { + if (iter_o == NULL) { JUMP_TO_ERROR(); } + iter = PyStackRef_FromPyObjectSteal(iter_o); PyStackRef_CLOSE(iterable); } } -- cgit v1.2.3