feedc0de/date
1
0
Fork 0
forked from HowardHinnant/date
Code Pull Requests Activity

Fix overflow in Zone::to_sys_impl when input precision is too fine.

Browse Source
This commit is contained in:
Howard Hinnant
2015-11-03 19:47:03 -05:00
parent 2116eeade3
commit f19e7f22c7
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tz.h
View File

@@ -319,9 +319,9 @@ Zone::to_sys_impl(std::chrono::time_point<std::chrono::system_clock,
using namespace std::chrono; using namespace std::chrono;
auto i = get_info(tp, tz::local); auto i = get_info(tp, tz::local);
auto tp_sys = tp - i.offset; auto tp_sys = tp - i.offset;
if (tp_sys - i.begin <= days{1}) if (floor<seconds>(tp_sys) - i.begin <= days{1})
{ {
if (tp < i.begin + i.offset) if (floor<seconds>(tp) < i.begin + i.offset)
{ {
if (do_throw) if (do_throw)
{ {
@@ -331,13 +331,13 @@ Zone::to_sys_impl(std::chrono::time_point<std::chrono::system_clock,
} }
return i.begin; return i.begin;
} }
assert(tp >= i.begin + get_info(i.begin - seconds{1}, tz::utc).offset); assert(floor<seconds>(tp) >= i.begin + get_info(i.begin - seconds{1}, tz::utc).offset);
} }
if (i.end - tp_sys <= days{1}) if (i.end - floor<seconds>(tp_sys) <= days{1})
{ {
assert(tp < i.end + i.offset); assert(floor<seconds>(tp) < i.end + i.offset);
auto next = get_info(i.end, tz::utc); auto next = get_info(i.end, tz::utc);
if (tp >= i.end + next.offset) if (floor<seconds>(tp) >= i.end + next.offset)
{ {
if (do_throw) if (do_throw)
throw ambiguous_local_time(tp, i.offset, i.abbrev, throw ambiguous_local_time(tp, i.offset, i.abbrev,