Skip to content

Fix timestamp96 decoding at zero seconds #1190

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 8, 2026
Merged

Fix timestamp96 decoding at zero seconds #1190

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
4 changes: 2 additions & 2 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 @@ -161,7 +161,7 @@ struct as<std::chrono::time_point<Clock, Duration>> {
int64_t sec;
_msgpack_load64(int64_t, o.via.ext.data() + 4, &sec);

if (sec > 0) {
if (sec >= 0) {
tp += std::chrono::seconds(sec);
tp += std::chrono::duration_cast<Duration>(
std::chrono::nanoseconds(nanosec));
Expand Down Expand Up @@ -215,7 +215,7 @@ struct convert<std::chrono::time_point<Clock, Duration>> {
int64_t sec;
_msgpack_load64(int64_t, o.via.ext.data() + 4, &sec);

if (sec > 0) {
if (sec >= 0) {
tp += std::chrono::seconds(sec);
tp += std::chrono::duration_cast<Duration>(
std::chrono::nanoseconds(nanosec));
Expand Down
18 changes: 18 additions & 0 deletions test/msgpack_cpp11.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1008,6 +1008,24 @@ BOOST_AUTO_TEST_CASE(system_clock_64_max)
BOOST_CHECK(val1 == val3);
}

BOOST_AUTO_TEST_CASE(system_clock_96_zero_seconds)
{
// Timestamp96 can also encode a nonnegative subsecond value.
typedef std::chrono::time_point<std::chrono::system_clock, std::chrono::microseconds> time_point;
char packed[] = {
static_cast<char>(0xc7u), 12, static_cast<char>(-1),
0, 0, 1, static_cast<char>(0xf4u), // 500 nanoseconds
0, 0, 0, 0, 0, 0, 0, 0 // zero seconds
};
msgpack::object_handle oh =
msgpack::unpack(packed, sizeof(packed));
BOOST_CHECK_EQUAL(oh.get().as<time_point>().time_since_epoch().count(), 0);

time_point converted(std::chrono::microseconds(123));
oh.get().convert(converted);
BOOST_CHECK_EQUAL(converted.time_since_epoch().count(), 0);
}

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