diff options
| author | Peter Bierma <zintensitydev@gmail.com> | 2024-11-05 04:56:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-05 15:26:36 +0530 |
| commit | 1371295e678f00a7c89dc5bb2ab61ede9adbc094 (patch) | |
| tree | fee7c410cf08814dae2d2a7963268862ce0b49a8 /Python/executor_cases.c.h | |
| parent | 407c0366d9ccd2a36c6cc8bf92324856b16fd604 (diff) | |
| download | cpython-1371295e678f00a7c89dc5bb2ab61ede9adbc094.tar.gz cpython-1371295e678f00a7c89dc5bb2ab61ede9adbc094.zip | |
gh-126366: Fix crash if `__iter__` raises an exception during `yield from` (#126369)
Diffstat (limited to 'Python/executor_cases.c.h')
| -rw-r--r-- | Python/executor_cases.c.h | 5 |
1 files changed, 3 insertions, 2 deletions
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); } } |