commit a4baf1c543bca261c27e98ba296e42665f3cb872
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Fri Sep 08 21:53:04 2017 -0700
committer Mariatta <Mariatta@users.noreply.github.com> Fri Sep 08 21:53:04 2017 -0700
tree 954fbc81fb080d4234f2fcee258803346a43d180
parent 3892799668dbf2b123a52780fd1d78f8880fdeb7

[3.6] bpo-26669: Fix nan arg value error in pytime.c (GH-3085) (GH-3467) 

* Modify NaN check function and error message
* Fix pytime.c when arg is nan
* fix whitespace
(cherry picked from commit 829dacce4fca60fc3c3367980e75e21dfcdbe6be)

Python/pytime.c

diff --git a/Python/pytime.c b/Python/pytime.c
index 387657a..b416eff 100644
--- a/Python/pytime.c
+++ b/Python/pytime.c
@@ -133,6 +133,11 @@
 
     if (PyFloat_Check(obj)) {
         double d = PyFloat_AsDouble(obj);
+        if (Py_IS_NAN(d)) {
+            *numerator = 0;
+            PyErr_SetString(PyExc_ValueError, "Invalid value NaN (not a number)");
+            return -1;
+        }
         return _PyTime_DoubleToDenominator(d, sec, numerator,
                                            denominator, round);
     }
@@ -154,6 +159,11 @@
         volatile double d;
 
         d = PyFloat_AsDouble(obj);
+        if (Py_IS_NAN(d)) {
+            PyErr_SetString(PyExc_ValueError, "Invalid value NaN (not a number)");
+            return -1;
+        }
+
         d = _PyTime_Round(d, round);
         (void)modf(d, &intpart);
 
@@ -301,6 +311,10 @@
     if (PyFloat_Check(obj)) {
         double d;
         d = PyFloat_AsDouble(obj);
+        if (Py_IS_NAN(d)) {
+            PyErr_SetString(PyExc_ValueError, "Invalid value NaN (not a number)");
+            return -1;
+        }
         return _PyTime_FromFloatObject(t, d, round, unit_to_ns);
     }
     else {