mirror of
https://github.com/HowardHinnant/date.git
synced 2024-12-27 16:41:04 +08:00
Restrict the range of year:
to within the range of chrono::minutes. * This prevents overflow when adding minutes to day_point when minutes is stored in 32 bits. * Also added static checks on the range of hours and seconds. If these static checks fire, the range of year should be further reduced. * This does not impact gcc at all. It impacts clang only when targeting 32 bit architectures. And it fixes overflow on Visual Studio. * Thanks much to https://github.com/gmcode for the herculean effort in tracking this down.
This commit is contained in:
parent
17bd48d23c
commit
2e715844bb
15
date.h
15
date.h
@ -6,6 +6,7 @@
|
|||||||
// http://creativecommons.org/licenses/by/4.0/
|
// http://creativecommons.org/licenses/by/4.0/
|
||||||
|
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
|
#include <climits>
|
||||||
#if !(__cplusplus >= 201402)
|
#if !(__cplusplus >= 201402)
|
||||||
# include <cmath>
|
# include <cmath>
|
||||||
#endif
|
#endif
|
||||||
@ -1161,7 +1162,12 @@ inline
|
|||||||
year
|
year
|
||||||
year::min() noexcept
|
year::min() noexcept
|
||||||
{
|
{
|
||||||
return year{std::numeric_limits<short>::min()};
|
using namespace std::chrono;
|
||||||
|
static_assert(sizeof(seconds)*CHAR_BIT >= 41, "seconds may overflow");
|
||||||
|
static_assert(sizeof(hours)*CHAR_BIT >= 30, "hours may overflow");
|
||||||
|
return sizeof(minutes)*CHAR_BIT < 34 ?
|
||||||
|
year{1970} + duration_cast<years>(minutes::min()) :
|
||||||
|
year{std::numeric_limits<short>::min()};
|
||||||
}
|
}
|
||||||
|
|
||||||
CONSTCD11
|
CONSTCD11
|
||||||
@ -1169,7 +1175,12 @@ inline
|
|||||||
year
|
year
|
||||||
year::max() noexcept
|
year::max() noexcept
|
||||||
{
|
{
|
||||||
return year{std::numeric_limits<short>::max()};
|
using namespace std::chrono;
|
||||||
|
static_assert(sizeof(seconds)*CHAR_BIT >= 41, "seconds may overflow");
|
||||||
|
static_assert(sizeof(hours)*CHAR_BIT >= 30, "hours may overflow");
|
||||||
|
return sizeof(minutes)*CHAR_BIT < 34 ?
|
||||||
|
year{1969} + duration_cast<years>(minutes::max()) :
|
||||||
|
year{std::numeric_limits<short>::max()};
|
||||||
}
|
}
|
||||||
|
|
||||||
CONSTCD11
|
CONSTCD11
|
||||||
|
Loading…
x
Reference in New Issue
Block a user