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

Avoid signed integral overflow in to_stream

Browse Source 
Fixes: #696
This commit is contained in:
Howard Hinnant
2021-08-31 17:42:18 -04:00
parent 1ff7208036
commit e1aa4837e0
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/date/date.h
View File

@@ -6213,8 +6213,13 @@ to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt,
const std::chrono::seconds* offset_sec = nullptr) const std::chrono::seconds* offset_sec = nullptr)
{ {
using CT = typename std::common_type<Duration, std::chrono::seconds>::type; using CT = typename std::common_type<Duration, std::chrono::seconds>::type;
auto ld = floor<days>(tp); auto ld = std::chrono::time_point_cast<days>(tp);
fields<CT> fds{year_month_day{ld}, hh_mm_ss<CT>{tp-local_seconds{ld}}}; fields<CT> fds;
if (ld <= tp)
fds = fields<CT>{year_month_day{ld}, hh_mm_ss<CT>{tp-local_seconds{ld}}};
else
fds = fields<CT>{year_month_day{ld - days{1}},
hh_mm_ss<CT>{days{1} - (local_seconds{ld} - tp)}};
return to_stream(os, fmt, fds, abbrev, offset_sec); return to_stream(os, fmt, fds, abbrev, offset_sec);
} }
@@ -6227,8 +6232,13 @@ to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt,
using CT = typename std::common_type<Duration, seconds>::type; using CT = typename std::common_type<Duration, seconds>::type;
const std::string abbrev("UTC"); const std::string abbrev("UTC");
CONSTDATA seconds offset{0}; CONSTDATA seconds offset{0};
auto sd = floor<days>(tp); auto sd = std::chrono::time_point_cast<days>(tp);
fields<CT> fds{year_month_day{sd}, hh_mm_ss<CT>{tp-sys_seconds{sd}}}; fields<CT> fds;
if (sd <= tp)
fds = fields<CT>{year_month_day{sd}, hh_mm_ss<CT>{tp-sys_seconds{sd}}};
else
fds = fields<CT>{year_month_day{sd - days{1}},
hh_mm_ss<CT>{days{1} - (sys_seconds{sd} - tp)}};
return to_stream(os, fmt, fds, &abbrev, &offset); return to_stream(os, fmt, fds, &abbrev, &offset);
} }