bpo-31577: Fix a crash in os.utime() in case of a bad ns argument. (GH-3752)
(cherry picked from commit 0bd1a2dcfdf36b181385ae61361e7692f4ebb0fd)
Co-authored-by: Oren Milman <orenmn@gmail.com>
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index a140ae0..79ddc48 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -635,6 +635,22 @@
with self.assertRaises(ValueError):
os.utime(self.fname, (5, 5), ns=(5, 5))
+ @support.cpython_only
+ def test_issue31577(self):
+ # The interpreter shouldn't crash in case utime() received a bad
+ # ns argument.
+ def get_bad_int(divmod_ret_val):
+ class BadInt:
+ def __divmod__(*args):
+ return divmod_ret_val
+ return BadInt()
+ with self.assertRaises(TypeError):
+ os.utime(self.fname, ns=(get_bad_int(42), 1))
+ with self.assertRaises(TypeError):
+ os.utime(self.fname, ns=(get_bad_int(()), 1))
+ with self.assertRaises(TypeError):
+ os.utime(self.fname, ns=(get_bad_int((1, 2, 3)), 1))
+
from test import mapping_tests
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-25-20-36-24.bpo-31577.jgYsSA.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-25-20-36-24.bpo-31577.jgYsSA.rst
new file mode 100644
index 0000000..8142882
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-09-25-20-36-24.bpo-31577.jgYsSA.rst
@@ -0,0 +1,2 @@
+Fix a crash in `os.utime()` in case of a bad ns argument. Patch by Oren
+Milman.
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index d487e53..bbbff1e 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -4563,6 +4563,12 @@
divmod = PyNumber_Divmod(py_long, billion);
if (!divmod)
goto exit;
+ if (!PyTuple_Check(divmod) || PyTuple_GET_SIZE(divmod) != 2) {
+ PyErr_Format(PyExc_TypeError,
+ "%.200s.__divmod__() must return a 2-tuple, not %.200s",
+ Py_TYPE(py_long)->tp_name, Py_TYPE(divmod)->tp_name);
+ goto exit;
+ }
*s = _PyLong_AsTime_t(PyTuple_GET_ITEM(divmod, 0));
if ((*s == -1) && PyErr_Occurred())
goto exit;