Skip to content

gh-99110: Initialize frame->previous in init_frame to fix segmentation fault #100182

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

Merged
kumaraditya303 merged 10 commits into from
Dec 23, 2022
Merged

gh-99110: Initialize frame->previous in init_frame to fix segmentation fault #100182

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b2e7256
Initialize frame->previous in _PyFrame_InitializeSpecials.
byllyfish Dec 12, 2022
b6e290d
📜🤖 Added by blurb_it.
blurb-it[bot] Dec 12, 2022
f667d8f
Fixing Python file whitespace. (patchcheck)
byllyfish Dec 12, 2022
d679783
Move initialization of frame->previous to init_frame.
byllyfish Dec 13, 2022
230b80e
Move comment above function.
byllyfish Dec 18, 2022
4e70dc5
Add frame_new function to _testcapimodule.c.
byllyfish Dec 18, 2022
627e8d5
Remove blank line.
byllyfish Dec 18, 2022
35a4c58
Use assertIsNone
kumaraditya303 Dec 23, 2022
34bee72
Merge branch 'main' into fix-issue-99110
kumaraditya303 Dec 23, 2022
2c1db99
Update Misc/NEWS.d/next/Core and Builtins/2022-12-12-01-05-16.gh-issu…
kumaraditya303 Dec 23, 2022
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
Prev Previous commit
Next Next commit
Move initialization of frame->previous to init_frame. 
Use self.assertEquals instead of assert.
  • Loading branch information
@byllyfish
byllyfish committed Dec 13, 2022
commit d6797833bcb0fb6195de0fb23b4c2643122af69f
2 changes: 1 addition & 1 deletion Include/internal/pycore_frame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@ _PyFrame_InitializeSpecials(
frame->f_locals = locals;
frame->stacktop = code->co_nlocalsplus;
frame->frame_obj = NULL;
frame->previous = NULL;
frame->prev_instr = _PyCode_CODE(code) - 1;
frame->yield_offset = 0;
frame->owner = FRAME_OWNED_BY_THREAD;
// frame->previous: initialized when frame is linked into the frame stack
Comment thread
kumaraditya303 marked this conversation as resolved.
Outdated
}

/* Gets the pointer to the locals array
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_ctypes/test_python_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def dummy():
)

# The following line should not cause a segmentation fault.
assert frame.f_back is None
self.assertEqual(frame.f_back, None)


if __name__ == "__main__":
Expand Down
3 changes: 2 additions & 1 deletion Misc/NEWS.d/next/Core and Builtins/2022-12-12-01-05-16.gh-issue-99110.1JqtIg.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
Initialize frame->previous in _PyFrame_InitializeSpecials.
Initialize frame->previous in frameobject.c to fix a segmentation fault when
accessing frames created by ctypes.
Comment thread
kumaraditya303 marked this conversation as resolved.
Outdated
1 change: 1 addition & 0 deletions Objects/frameobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1013,6 +1013,7 @@ init_frame(_PyInterpreterFrame *frame, PyFunctionObject *func, PyObject *locals)
PyCodeObject *code = (PyCodeObject *)func->func_code;
_PyFrame_InitializeSpecials(frame, (PyFunctionObject*)Py_NewRef(func),
Py_XNewRef(locals), code);
frame->previous = NULL;
for (Py_ssize_t i = 0; i < code->co_nlocalsplus; i++) {
frame->localsplus[i] = NULL;
}
Expand Down