[Python-checkins] bpo-35371: Fix possible crash in os.utime() on Windows. (GH-10844)

Sat Dec 1 07:30:23 EST 2018

https://github.com/python/cpython/commit/32bc11c33cf5ccea165b5f4ac3799f02fdf9c76a
commit: 32bc11c33cf5ccea165b5f4ac3799f02fdf9c76a
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2018年12月01日T14:30:20+02:00
summary:
bpo-35371: Fix possible crash in os.utime() on Windows. (GH-10844)
files:
A Misc/NEWS.d/next/Library/2018-12-01-13-44-12.bpo-35371.fTAwlX.rst
M Lib/test/test_os.py
M Modules/posixmodule.c

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 3f6e48f0c8e6..aca445f91620 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -634,6 +634,29 @@ def test_utime_invalid_arguments(self):
 # seconds and nanoseconds parameters are mutually exclusive
 with self.assertRaises(ValueError):
 os.utime(self.fname, (5, 5), ns=(5, 5))
+ with self.assertRaises(TypeError):
+ os.utime(self.fname, [5, 5])
+ with self.assertRaises(TypeError):
+ os.utime(self.fname, (5,))
+ with self.assertRaises(TypeError):
+ os.utime(self.fname, (5, 5, 5))
+ with self.assertRaises(TypeError):
+ os.utime(self.fname, ns=[5, 5])
+ with self.assertRaises(TypeError):
+ os.utime(self.fname, ns=(5,))
+ with self.assertRaises(TypeError):
+ os.utime(self.fname, ns=(5, 5, 5))
+
+ if os.utime not in os.supports_follow_symlinks:
+ with self.assertRaises(NotImplementedError):
+ os.utime(self.fname, (5, 5), follow_symlinks=False)
+ if os.utime not in os.supports_fd:
+ with open(self.fname, 'wb', 0) as fp:
+ with self.assertRaises(TypeError):
+ os.utime(fp.fileno(), (5, 5))
+ if os.utime not in os.supports_dir_fd:
+ with self.assertRaises(NotImplementedError):
+ os.utime(self.fname, (5, 5), dir_fd=0)
 
 @support.cpython_only
 def test_issue31577(self):
diff --git a/Misc/NEWS.d/next/Library/2018-12-01-13-44-12.bpo-35371.fTAwlX.rst b/Misc/NEWS.d/next/Library/2018-12-01-13-44-12.bpo-35371.fTAwlX.rst
new file mode 100644
index 000000000000..f40d13939311
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2018-12-01-13-44-12.bpo-35371.fTAwlX.rst
@@ -0,0 +1,2 @@
+Fixed possible crash in ``os.utime()`` on Windows when pass incorrect
+arguments.
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index d42e40f243e2..7571385ae51d 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -4689,7 +4689,6 @@ os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns,
 int result;
 #endif
 
- PyObject *return_value = NULL;
 utime_t utime;
 
 memset(&utime, 0, sizeof(utime_t));
@@ -4698,7 +4697,7 @@ os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns,
 PyErr_SetString(PyExc_ValueError,
 "utime: you may specify either 'times'"
 " or 'ns' but not both");
- goto exit;
+ return NULL;
 }
 
 if (times && (times != Py_None)) {
@@ -4708,14 +4707,14 @@ os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns,
 PyErr_SetString(PyExc_TypeError,
 "utime: 'times' must be either"
 " a tuple of two ints or None");
- goto exit;
+ return NULL;
 }
 utime.now = 0;
 if (_PyTime_ObjectToTimespec(PyTuple_GET_ITEM(times, 0),
 &a_sec, &a_nsec, _PyTime_ROUND_FLOOR) == -1 ||
 _PyTime_ObjectToTimespec(PyTuple_GET_ITEM(times, 1),
 &m_sec, &m_nsec, _PyTime_ROUND_FLOOR) == -1) {
- goto exit;
+ return NULL;
 }
 utime.atime_s = a_sec;
 utime.atime_ns = a_nsec;
@@ -4726,14 +4725,14 @@ os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns,
 if (!PyTuple_CheckExact(ns) || (PyTuple_Size(ns) != 2)) {
 PyErr_SetString(PyExc_TypeError,
 "utime: 'ns' must be a tuple of two ints");
- goto exit;
+ return NULL;
 }
 utime.now = 0;
 if (!split_py_long_to_s_and_ns(PyTuple_GET_ITEM(ns, 0),
 &utime.atime_s, &utime.atime_ns) ||
 !split_py_long_to_s_and_ns(PyTuple_GET_ITEM(ns, 1),
 &utime.mtime_s, &utime.mtime_ns)) {
- goto exit;
+ return NULL;
 }
 }
 else {
@@ -4743,20 +4742,20 @@ os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns,
 
 #if !defined(UTIME_HAVE_NOFOLLOW_SYMLINKS)
 if (follow_symlinks_specified("utime", follow_symlinks))
- goto exit;
+ return NULL;
 #endif
 
 if (path_and_dir_fd_invalid("utime", path, dir_fd) ||
 dir_fd_and_fd_invalid("utime", dir_fd, path->fd) ||
 fd_and_follow_symlinks_invalid("utime", path->fd, follow_symlinks))
- goto exit;
+ return NULL;
 
 #if !defined(HAVE_UTIMENSAT)
 if ((dir_fd != DEFAULT_DIR_FD) && (!follow_symlinks)) {
 PyErr_SetString(PyExc_ValueError,
 "utime: cannot use dir_fd and follow_symlinks "
 "together on this platform");
- goto exit;
+ return NULL;
 }
 #endif
 
@@ -4768,7 +4767,7 @@ os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns,
 Py_END_ALLOW_THREADS
 if (hFile == INVALID_HANDLE_VALUE) {
 path_error(path);
- goto exit;
+ return NULL;
 }
 
 if (utime.now) {
@@ -4785,8 +4784,10 @@ os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns,
 something is wrong with the file, when it also
 could be the time stamp that gives a problem. */
 PyErr_SetFromWindowsErr(0);
- goto exit;
+ CloseHandle(hFile);
+ return NULL;
 }
+ CloseHandle(hFile);
 #else /* MS_WINDOWS */
 Py_BEGIN_ALLOW_THREADS
 
@@ -4814,21 +4815,13 @@ os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns,
 
 if (result < 0) {
 /* see previous comment about not putting filename in error here */
- return_value = posix_error();
- goto exit;
+ posix_error();
+ return NULL;
 }
 
 #endif /* MS_WINDOWS */
 
- Py_INCREF(Py_None);
- return_value = Py_None;
-
-exit:
-#ifdef MS_WINDOWS
- if (hFile != INVALID_HANDLE_VALUE)
- CloseHandle(hFile);
-#endif
- return return_value;
+ Py_RETURN_NONE;
 }
 
 /* Process operations */
