Skip to content

gh-77046: Pass the _O_NOINHERIT flag to _open_osfhandle() calls #13739

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
wants to merge 1 commit into from
Closed

gh-77046: Pass the _O_NOINHERIT flag to _open_osfhandle() calls #13739

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
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2019-06-01-23-55-50.bpo-32865.Ha11I1.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
On Windows, do not use inheritable file descriptors to wrap handles in
:func:`os.pipe`.
Copy link
Member

Choose a reason for hiding this comment

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

Would you mind to also document _io._WindowsConsoleIO.fileno() fix?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you, Victor, for looking at this PR -- I will update it soon.

6 changes: 4 additions & 2 deletions Modules/_io/winconsoleio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,9 +478,11 @@ _io__WindowsConsoleIO_fileno_impl(winconsoleio *self)
if (self->fd < 0 && self->handle != INVALID_HANDLE_VALUE) {
_Py_BEGIN_SUPPRESS_IPH
if (self->writable)
self->fd = _open_osfhandle((intptr_t)self->handle, _O_WRONLY | _O_BINARY);
self->fd = _open_osfhandle((intptr_t)self->handle,
_O_WRONLY | _O_BINARY | _O_NOINHERIT);
else
self->fd = _open_osfhandle((intptr_t)self->handle, _O_RDONLY | _O_BINARY);
self->fd = _open_osfhandle((intptr_t)self->handle,
_O_RDONLY | _O_BINARY | _O_NOINHERIT);
_Py_END_SUPPRESS_IPH
}
if (self->fd < 0)
Expand Down
4 changes: 2 additions & 2 deletions Modules/posixmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9200,8 +9200,8 @@ os_pipe_impl(PyObject *module)
_Py_BEGIN_SUPPRESS_IPH
ok = CreatePipe(&read, &write, &attr, 0);
if (ok) {
fds[0] = _open_osfhandle((intptr_t)read, _O_RDONLY);
fds[1] = _open_osfhandle((intptr_t)write, _O_WRONLY);
fds[0] = _open_osfhandle((intptr_t)read, _O_RDONLY | _O_NOINHERIT);
fds[1] = _open_osfhandle((intptr_t)write, _O_WRONLY | _O_NOINHERIT);
if (fds[0] == -1 || fds[1] == -1) {
CloseHandle(read);
CloseHandle(write);
Expand Down