Skip to content

Fix division by zero when packing coarse or sub-nanosecond time_points #1193

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
redboltz merged 1 commit into from
Oct 26, 2026
Merged

Fix division by zero when packing coarse or sub-nanosecond time_points #1193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 10 additions & 21 deletions include/msgpack/v1/adaptor/cpp11/chrono.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,20 +246,15 @@ template <typename Clock, typename Duration>
struct pack<std::chrono::time_point<Clock, Duration>> {
template <typename Stream>
msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, std::chrono::time_point<Clock, Duration> const& v) const {
int64_t count = detail::integral_cast<int64_t>(v.time_since_epoch().count());
int64_t nano_num =
Duration::period::ratio::num *
(1000000000L / Duration::period::ratio::den);

int64_t nanosec = count % (1000000000L / nano_num) * nano_num;
int64_t sec = 0;
std::chrono::seconds whole_sec =
std::chrono::duration_cast<std::chrono::seconds>(v.time_since_epoch());
int64_t nanosec = std::chrono::duration_cast<std::chrono::nanoseconds>(
v.time_since_epoch() - whole_sec).count();
int64_t sec = whole_sec.count();
if (nanosec < 0) {
nanosec = 1000000000L + nanosec;
--sec;
}
sec += count
* Duration::period::ratio::num
/ Duration::period::ratio::den;

if ((sec >> 34) == 0) {
uint64_t data64 = (detail::integral_cast<uint64_t>(nanosec) << 34) | detail::integral_cast<uint64_t>(sec);
Expand Down Expand Up @@ -296,21 +291,15 @@ struct pack<std::chrono::time_point<Clock, Duration>> {
template <typename Clock, typename Duration>
struct object_with_zone<std::chrono::time_point<Clock, Duration>> {
void operator()(msgpack::object::with_zone& o, const std::chrono::time_point<Clock, Duration>& v) const {
int64_t count = detail::integral_cast<int64_t>(v.time_since_epoch().count());

int64_t nano_num =
Duration::period::ratio::num *
(1000000000L / Duration::period::ratio::den);

int64_t nanosec = count % (1000000000L / nano_num) * nano_num;
int64_t sec = 0;
std::chrono::seconds whole_sec =
std::chrono::duration_cast<std::chrono::seconds>(v.time_since_epoch());
int64_t nanosec = std::chrono::duration_cast<std::chrono::nanoseconds>(
v.time_since_epoch() - whole_sec).count();
int64_t sec = whole_sec.count();
if (nanosec < 0) {
nanosec = 1000000000L + nanosec;
--sec;
}
sec += count
* Duration::period::ratio::num
/ Duration::period::ratio::den;
if ((sec >> 34) == 0) {
uint64_t data64 = (detail::integral_cast<uint64_t>(nanosec) << 34) | detail::integral_cast<uint64_t>(sec);
if ((data64 & 0xffffffff00000000L) == 0) {
Expand Down
48 changes: 48 additions & 0 deletions test/msgpack_cpp11.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1026,6 +1026,54 @@ BOOST_AUTO_TEST_CASE(system_clock_96_zero_seconds)
BOOST_CHECK_EQUAL(converted.time_since_epoch().count(), 0);
}

BOOST_AUTO_TEST_CASE(system_clock_minutes)
{
typedef std::chrono::time_point<std::chrono::system_clock, std::chrono::minutes> time_point;
time_point val1(std::chrono::minutes(2));
msgpack::sbuffer sbuf;
msgpack::pack(sbuf, val1);
char packed[] = {
static_cast<char>(0xd6u),
static_cast<char>(-1),
0, 0, 0, static_cast<char>(0x78) // 120 seconds
};
BOOST_CHECK_EQUAL(sbuf.size(), sizeof(packed));
BOOST_CHECK_EQUAL(memcmp(sbuf.data(), packed, sizeof(packed)), 0);

msgpack::object_handle oh =
msgpack::unpack(sbuf.data(), sbuf.size());
std::chrono::system_clock::time_point val2 = oh.get().as<std::chrono::system_clock::time_point>();
BOOST_CHECK(val1 == val2);
}

BOOST_AUTO_TEST_CASE(system_clock_minutes_negative)
{
typedef std::chrono::time_point<std::chrono::system_clock, std::chrono::minutes> time_point;
time_point val1(std::chrono::minutes(-2));
msgpack::sbuffer sbuf;
msgpack::pack(sbuf, val1);

msgpack::object_handle oh =
msgpack::unpack(sbuf.data(), sbuf.size());
std::chrono::system_clock::time_point val2 = oh.get().as<std::chrono::system_clock::time_point>();
BOOST_CHECK(val1 == val2);
}

BOOST_AUTO_TEST_CASE(system_clock_picoseconds)
{
typedef std::chrono::duration<int64_t, std::pico> picoseconds;
typedef std::chrono::time_point<std::chrono::system_clock, picoseconds> time_point;
// 1.5 s, which system_clock can represent on every platform
time_point val1(picoseconds(1500000000000LL));
msgpack::sbuffer sbuf;
msgpack::pack(sbuf, val1);

msgpack::object_handle oh =
msgpack::unpack(sbuf.data(), sbuf.size());
std::chrono::system_clock::time_point val2 = oh.get().as<std::chrono::system_clock::time_point>();
BOOST_CHECK(val1 == val2);
}

BOOST_AUTO_TEST_CASE(system_clock_impl_min)
{
std::chrono::system_clock::time_point val1(std::chrono::system_clock::time_point::min());
Expand Down
16 changes: 16 additions & 0 deletions test/object_with_zone.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -967,6 +967,22 @@ BOOST_AUTO_TEST_CASE(system_clock_64_max)
BOOST_CHECK(obj.as<std::chrono::system_clock::time_point>() == v);
}

BOOST_AUTO_TEST_CASE(system_clock_minutes)
{
std::chrono::time_point<std::chrono::system_clock, std::chrono::minutes> v(std::chrono::minutes(2));
msgpack::zone z;
msgpack::object obj(v, z);
BOOST_CHECK(obj.as<std::chrono::system_clock::time_point>() == v);
}

BOOST_AUTO_TEST_CASE(system_clock_minutes_negative)
{
std::chrono::time_point<std::chrono::system_clock, std::chrono::minutes> v(std::chrono::minutes(-2));
msgpack::zone z;
msgpack::object obj(v, z);
BOOST_CHECK(obj.as<std::chrono::system_clock::time_point>() == v);
}

BOOST_AUTO_TEST_CASE(system_clock_impl_min)
{
std::chrono::system_clock::time_point v(std::chrono::system_clock::time_point::min());
Expand Down
Loading