X Tutup
Skip to content

bpo-26669: Fix nan arg value error in pytime.c #3085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 4 commits into from
Sep 8, 2017
Merged

bpo-26669: Fix nan arg value error in pytime.c #3085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2bd36c3
Fix #26669
hahnlee Aug 13, 2017
9738f51
Modify NaN check function and error message
hahnlee Aug 18, 2017
5812e36
Fix pytime.c when arg is nan
hahnlee Sep 8, 2017
eb06ed0
fix whitespace
hahnlee Sep 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions Lib/test/test_time.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,10 @@ def test_localtime_failure(self):
self.assertRaises(OSError, time.localtime, invalid_time_t)
self.assertRaises(OSError, time.ctime, invalid_time_t)

# Issue #26669: check for localtime() failure
self.assertRaises(ValueError, time.localtime, float("nan"))
self.assertRaises(ValueError, time.ctime, float("nan"))
Copy link
Copy Markdown
Member

@vstinner vstinner Aug 31, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok for "functional" tests", but I also would like to see unit tests on the following _testcapi functions:

  • pytime_object_to_time_t
  • pytime_object_to_timeval
  • pytime_object_to_timespec
  • PyTime_FromSeconds
  • PyTime_FromSecondsObject
  • PyTime_AsSecondsDouble

See CPyTimeTestCase in test_time.py.


def test_get_clock_info(self):
clocks = ['clock', 'perf_counter', 'process_time', 'time']
if hasattr(time, 'monotonic'):
Expand Down Expand Up @@ -823,6 +827,11 @@ def c_int_filter(secs):
lambda secs: secs * SEC_TO_NS,
value_filter=c_int_filter)

# test nan
for time_rnd, _ in ROUNDING_MODES:
with self.assertRaises(TypeError):
PyTime_FromSeconds(float('nan'))

def test_FromSecondsObject(self):
from _testcapi import PyTime_FromSecondsObject

Expand All @@ -834,6 +843,11 @@ def test_FromSecondsObject(self):
PyTime_FromSecondsObject,
lambda ns: self.decimal_round(ns * SEC_TO_NS))

# test nan
for time_rnd, _ in ROUNDING_MODES:
with self.assertRaises(ValueError):
PyTime_FromSecondsObject(float('nan'), time_rnd)

def test_AsSecondsDouble(self):
from _testcapi import PyTime_AsSecondsDouble

Expand All @@ -847,6 +861,11 @@ def float_converter(ns):
float_converter,
NS_TO_SEC)

# test nan
for time_rnd, _ in ROUNDING_MODES:
with self.assertRaises(TypeError):
PyTime_AsSecondsDouble(float('nan'))

def create_decimal_converter(self, denominator):
denom = decimal.Decimal(denominator)

Expand Down Expand Up @@ -952,6 +971,11 @@ def test_object_to_timeval(self):
self.create_converter(SEC_TO_US),
value_filter=self.time_t_filter)

# test nan
for time_rnd, _ in ROUNDING_MODES:
with self.assertRaises(ValueError):
pytime_object_to_timeval(float('nan'), time_rnd)

def test_object_to_timespec(self):
from _testcapi import pytime_object_to_timespec

Expand All @@ -963,6 +987,11 @@ def test_object_to_timespec(self):
self.create_converter(SEC_TO_NS),
value_filter=self.time_t_filter)

# test nan
for time_rnd, _ in ROUNDING_MODES:
with self.assertRaises(ValueError):
pytime_object_to_timespec(float('nan'), time_rnd)


if __name__ == "__main__":
unittest.main()
14 changes: 14 additions & 0 deletions Python/pytime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,11 @@ _PyTime_ObjectToDenominator(PyObject *obj, time_t *sec, long *numerator,

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);
}
Expand All @@ -155,6 +160,11 @@ _PyTime_ObjectToTime_t(PyObject *obj, time_t *sec, _PyTime_round_t round)
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);

Expand Down Expand Up @@ -301,6 +311,10 @@ _PyTime_FromObject(_PyTime_t *t, PyObject *obj, _PyTime_round_t round,
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 {
Expand Down
X Tutup