Skip to content

bpo-40826: Fix segfaults issue when close file descriptor 0 on REPL #20549

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

Closed
corona10 wants to merge 2 commits into from
Closed

bpo-40826: Fix segfaults issue when close file descriptor 0 on REPL #20549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f02174
bpo-40826: Update PyOS_InterruptOccurred to handle tstate is NULL
corona10 May 31, 2020
9524994
bpo-40826: Update
corona10 May 31, 2020
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
15 changes: 15 additions & 0 deletions Lib/test/test_repl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,21 @@ def test_multiline_string_parsing(self):
output = kill_python(p)
self.assertEqual(p.returncode, 0)

@cpython_only
@unittest.skipIf(sys.platform =="win32", 'Skip Windows')
def test_close_fd_zero(self):
user_input = '''\
import os
os.close(0)
'''
user_input = dedent(user_input)
user_input = user_input.encode()
p = spawn_repl()
with SuppressCrashReport():
p.stdin.write(user_input)
output = kill_python(p)
self.assertEqual(p.returncode, 0)


if __name__ == "__main__":
unittest.main()
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2020-05-31-13-57-36.bpo-40826.TKBXAB.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix segfaults issue when close file descriptor 0 on REPL. Patch by Dong-hee
Na.
8 changes: 6 additions & 2 deletions Modules/signalmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1782,8 +1782,12 @@ PyOS_FiniInterrupts(void)
int
PyOS_InterruptOccurred(void)
{
PyInterpreterState *interp = _PyInterpreterState_GET();
if (!_Py_ThreadCanHandleSignals(interp)) {
PyThreadState *tstate = _PyThreadState_GET();
if (tstate == NULL) {
// FIXME: PyGILState_GetThisThreadState doesn't support subinterpreters.
tstate = PyGILState_GetThisThreadState();
}
if (!_Py_ThreadCanHandleSignals(tstate->interp)) {
return 0;
}

Expand Down