commit 329ea4ef7cc3a907a64c6f0702fc93206b6744de
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Wed Sep 12 12:46:30 2018 -0700
committer GitHub <noreply@github.com> Wed Sep 12 12:46:30 2018 -0700
tree 300bb0c3aa68ad260538ffe98528f69eefba2857
parent 72c34cf6dd5fb206fe4d407ff603468af466fd2e

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>

Modules/posixmodule.c

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;