Skip to content

bpo-46210: Fix deadlock in print. #30310

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
notarealdeveloper wants to merge 15 commits into from
Closed

bpo-46210: Fix deadlock in print. #30310

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
dc5d787
Fix deadlock in print.
notarealdeveloper Dec 30, 2021
46d4ce6
Add Misc/NEWS.d entry.
notarealdeveloper Dec 30, 2021
3409181
Only add _at_fork_reinit if fork is available.
notarealdeveloper Dec 31, 2021
19f19b7
Use Py_RETURN_* in Modules/_io/bufferedio.c:buffered_at_fork_reinit
notarealdeveloper Dec 31, 2021
f5334b4
Fix up reference counting in Python/pystate.c:stdio_at_fork_reinit
notarealdeveloper Dec 31, 2021
3858006
Formatting for PEP 7.
notarealdeveloper Jan 5, 2022
fb0bd16
Add _PySys_ReInitStdio to Python/sysmodule.c
notarealdeveloper Jan 5, 2022
8c8d9c9
Call _PySys_ReInitStdio in PyOS_AfterFork_Child.
notarealdeveloper Jan 5, 2022
a14bf74
Avoid adding a new python method.
notarealdeveloper Jan 24, 2022
be40192
Add TestStdioAtForkReInit to test_thread.py
notarealdeveloper Jan 24, 2022
bf9b398
Move INCREF in _PyIO_buffered_at_fork_reinit
notarealdeveloper Feb 7, 2022
5681a02
Remove unused variable in stdio_at_fork_reinit
notarealdeveloper Feb 7, 2022
2054bfa
Correct buffer->lock reinit logic.
notarealdeveloper Feb 8, 2022
a8e4185
Merge remote-tracking branch 'upstream/main' into print
notarealdeveloper Feb 17, 2022
56a405f
stream_at_fork_reinit now uses _Py_ID instead of _Py_Identifier.
notarealdeveloper Feb 17, 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
Fix up reference counting in Python/pystate.c:stdio_at_fork_reinit
  • Loading branch information
@notarealdeveloper
notarealdeveloper committed Dec 31, 2021
commit f5334b40cea86a978715c7f13f7d31de97a7d1dc
27 changes: 10 additions & 17 deletions Python/pystate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,27 +179,18 @@ static int stdio_at_fork_reinit(_Py_Identifier *key)

int ret = 0;

PyObject *stdio, *closed, *isatty, *buffer, *result;
PyObject *isatty = NULL;
PyObject *buffer = NULL;
PyObject *result = NULL;

stdio = _PySys_GetObjectId(key);

_Py_IDENTIFIER(closed);
if (_PyObject_LookupAttrId(stdio, &PyId_closed, &closed) < 0) {
PyErr_Clear();
goto end;
}

if (Py_IsTrue(closed)) {
goto end;
}
PyObject *stdio = _PySys_GetObjectId(key);

_Py_IDENTIFIER(isatty);
if (_PyObject_GetAttrId(stdio, &PyId_isatty) == NULL) {
isatty = _PyObject_CallMethodIdNoArgs(stdio, &PyId_isatty);
if (isatty == NULL) {
PyErr_Clear();
goto end;
}

isatty = _PyObject_CallMethodIdNoArgs(stdio, &PyId_isatty);
if (Py_IsFalse(isatty)) {
goto end;
}
Expand All @@ -219,14 +210,16 @@ static int stdio_at_fork_reinit(_Py_Identifier *key)
}

result = _PyObject_CallMethodIdNoArgs(buffer, &PyId__at_fork_reinit);

if (result == Py_True) {
if (Py_IsTrue(result)) {
goto end;
}

/* error */
ret = -1;
end:
Py_XDECREF(isatty);
Py_XDECREF(buffer);
Py_XDECREF(result);
return ret;

@sweeneyde sweeneyde Dec 31, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there are a few more leaks here. Perhaps it would be simpler to initialize the variables to NULL, and then use Py_XDECREF in the end:/error: label.

}

Expand Down