Skip to content

[3.15] gh-151905: fix memory error handling in PyFrame_GetBack (GH-151906) #151919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
miss-islington wants to merge 1 commit into
base: 3.15
Choose a base branch
from
+5 −1
Open

[3.15] gh-151905: fix memory error handling in PyFrame_GetBack (GH-151906) #151919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core_and_Builtins/2026-06-22-06-26-34.gh-issue-151905.FOLMYg.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix OOM error handling in :c:func:`PyFrame_GetBack` to propagate exceptions instead of masking them as None.
5 changes: 4 additions & 1 deletion Objects/frameobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1117,7 +1117,7 @@ frame_back_get_impl(PyFrameObject *self)
/*[clinic end generated code: output=3a84c22a55a63c79 input=9e528570d0e1f44a]*/
{
PyObject *res = (PyObject *)PyFrame_GetBack(self);
if (res == NULL) {
if (res == NULL && !PyErr_Occurred()) {
Py_RETURN_NONE;
}
return res;
Expand Down Expand Up @@ -2405,6 +2405,9 @@ PyFrame_GetBack(PyFrameObject *frame)
prev = _PyFrame_GetFirstComplete(prev);
if (prev) {
back = _PyFrame_GetFrameObject(prev);
if (back == NULL) {
return NULL;
}
}
}
return (PyFrameObject*)Py_XNewRef(back);
Expand Down
Loading