From: Steve Dower <steve.dower@microsoft.com>
Date: Fri, 9 Sep 2016 16:03:15 +0000 (-0700)
Subject: Issue #27781: Fixes uninitialized fd when !MS_WINDOWS and !HAVE_OPENAT
X-Git-Tag: v3.6.0b1~215
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6230aaf56145f9ed67b6fbc572d9a3d3ae500e38;p=thirdparty%2FPython%2Fcpython.git

Issue #27781: Fixes uninitialized fd when !MS_WINDOWS and !HAVE_OPENAT
---

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index c1ba7ba9a64d..ce646846dfbe 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -7477,13 +7477,14 @@ os_open_impl(PyObject *module, path_t *path, int flags, int mode, int dir_fd)
         Py_BEGIN_ALLOW_THREADS
 #ifdef MS_WINDOWS
         fd = _wopen(path->wide, flags, mode);
-#endif
+#else
 #ifdef HAVE_OPENAT
         if (dir_fd != DEFAULT_DIR_FD)
             fd = openat(dir_fd, path->narrow, flags, mode);
         else
+#endif /* HAVE_OPENAT */
             fd = open(path->narrow, flags, mode);
-#endif
+#endif /* !MS_WINDOWS */
         Py_END_ALLOW_THREADS
     } while (fd < 0 && errno == EINTR && !(async_err = PyErr_CheckSignals()));
     _Py_END_SUPPRESS_IPH