3party/date
0
0
Fork 0
mirror of https://github.com/HowardHinnant/date.git synced 2024-12-27 08:31:03 +08:00
Code Issues Projects Releases Wiki Activity

Fix crasher for early local times and USE_OS_TZDB=1

Browse Source
This commit is contained in:
Howard Hinnant 2020-08-17 21:32:29 -04:00
parent e7969c32e8
commit 658a3b9495
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/tz.cpp
View File

@ -2125,14 +2125,25 @@ time_zone::load_sys_info(std::vector<detail::transition>::const_iterator i) cons
{ {
using namespace std::chrono; using namespace std::chrono;
assert(!transitions_.empty()); assert(!transitions_.empty());
assert(i != transitions_.begin());
sys_info r; sys_info r;
r.begin = i[-1].timepoint; if (i != transitions_.begin())
r.end = i != transitions_.end() ? i->timepoint : {
sys_seconds(sys_days(year::max()/max_day)); r.begin = i[-1].timepoint;
r.offset = i[-1].info->offset; r.end = i != transitions_.end() ? i->timepoint :
r.save = i[-1].info->is_dst ? minutes{1} : minutes{0}; sys_seconds(sys_days(year::max()/max_day));
r.abbrev = i[-1].info->abbrev; r.offset = i[-1].info->offset;
r.save = i[-1].info->is_dst ? minutes{1} : minutes{0};
r.abbrev = i[-1].info->abbrev;
}
else
{
r.begin = sys_days(year::min()/min_day);
r.end = i+1 != transitions_.end() ? i[1].timepoint :
sys_seconds(sys_days(year::max()/max_day));
r.offset = i[0].info->offset;
r.save = i[0].info->is_dst ? minutes{1} : minutes{0};
r.abbrev = i[0].info->abbrev;
}
return r; return r;
} }
@ -2167,7 +2178,7 @@ time_zone::get_info_impl(local_seconds tp) const
{ {
i.second = load_sys_info(--tr); i.second = load_sys_info(--tr);
tps = sys_seconds{(tp - i.second.offset).time_since_epoch()}; tps = sys_seconds{(tp - i.second.offset).time_since_epoch()};
if (tps < i.second.end) if (tps < i.second.end && i.first.end != i.second.end)
{ {
i.result = local_info::ambiguous; i.result = local_info::ambiguous;
std::swap(i.first, i.second); std::swap(i.first, i.second);