From: Alper <alper_yoney@hotmail.com>
Date: Thu, 17 Apr 2025 20:38:34 +0000 (-0700)
Subject: gh-131173: Improve exception handling during take_ownership processing (#132620)
X-Git-Tag: v3.14.0b1~428
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=22830103e598c63663b462c4e42b74e7a9d3bb99;p=thirdparty%2FPython%2Fcpython.git

gh-131173: Improve exception handling during take_ownership processing (#132620)

Save and restore exceptions during take_ownership processing to preserve
exceptions currently being raised.

Co-authored-by: alperyoney <alperyoney@fb.com>
---

diff --git a/Python/frame.c b/Python/frame.c
index 558f92055bbf..ce216797e47c 100644
--- a/Python/frame.c
+++ b/Python/frame.c
@@ -69,6 +69,7 @@ take_ownership(PyFrameObject *f, _PyInterpreterFrame *frame)
     _PyInterpreterFrame *prev = _PyFrame_GetFirstComplete(frame->previous);
     if (prev) {
         assert(prev->owner < FRAME_OWNED_BY_INTERPRETER);
+        PyObject *exc = PyErr_GetRaisedException();
         /* Link PyFrameObjects.f_back and remove link through _PyInterpreterFrame.previous */
         PyFrameObject *back = _PyFrame_GetFrameObject(prev);
         if (back == NULL) {
@@ -80,6 +81,7 @@ take_ownership(PyFrameObject *f, _PyInterpreterFrame *frame)
         else {
             f->f_back = (PyFrameObject *)Py_NewRef(back);
         }
+        PyErr_SetRaisedException(exc);
     }
     if (!_PyObject_GC_IS_TRACKED((PyObject *)f)) {
         _PyObject_GC_TRACK((PyObject *)f);