From 28fca0c422b425a6be43be31add0a5328c16b0b8 Mon Sep 17 00:00:00 2001 From: Zackery Spytz Date: Mon, 17 Jun 2019 01:17:14 -0600 Subject: bpo-37267: Do not check for FILE_TYPE_CHAR in os.dup() on Windows (GH-14051) On Windows, os.dup() no longer creates an inheritable fd when handling a character file. --- Python/fileutils.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'Python/fileutils.c') diff --git a/Python/fileutils.c b/Python/fileutils.c index 178e2f1268..93c093f89b 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c @@ -1776,7 +1776,6 @@ _Py_dup(int fd) { #ifdef MS_WINDOWS HANDLE handle; - DWORD ftype; #endif assert(PyGILState_Check()); @@ -1790,9 +1789,6 @@ _Py_dup(int fd) return -1; } - /* get the file type, ignore the error if it failed */ - ftype = GetFileType(handle); - Py_BEGIN_ALLOW_THREADS _Py_BEGIN_SUPPRESS_IPH fd = dup(fd); @@ -1803,14 +1799,11 @@ _Py_dup(int fd) return -1; } - /* Character files like console cannot be make non-inheritable */ - if (ftype != FILE_TYPE_CHAR) { - if (_Py_set_inheritable(fd, 0, NULL) < 0) { - _Py_BEGIN_SUPPRESS_IPH - close(fd); - _Py_END_SUPPRESS_IPH - return -1; - } + if (_Py_set_inheritable(fd, 0, NULL) < 0) { + _Py_BEGIN_SUPPRESS_IPH + close(fd); + _Py_END_SUPPRESS_IPH + return -1; } #elif defined(HAVE_FCNTL_H) && defined(F_DUPFD_CLOEXEC) Py_BEGIN_ALLOW_THREADS -- cgit v1.2.1