Skip to content

GH-54647: [C++] Reject leap seconds in the strptime timestamp parser #54659

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

Open
pearu wants to merge 1 commit into
base: main
Choose a base branch
from
+29 −11
Open

GH-54647: [C++] Reject leap seconds in the strptime timestamp parser #54659

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
6 changes: 6 additions & 0 deletions cpp/src/arrow/util/value_parsing.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,6 +848,12 @@ static inline bool ParseTimestampStrptime(const char* buf, size_t length,
// ignore the time part
arrow_vendored::date::sys_seconds secs = arrow_vendored::date::sys_days(ymd);
if (!ignore_time_in_day) {
// Reject leap seconds, which Arrow cannot represent, instead of adding them
// to the time of day (which wraps them into the next minute); consistent
// with the ISO-8601 parser.
if (result.tm_sec >= 60) {
return false;
}
secs += (std::chrono::hours(result.tm_hour) + std::chrono::minutes(result.tm_min) +
std::chrono::seconds(result.tm_sec));
#if !defined(_WIN32) && !defined(_AIX)
Expand Down
25 changes: 14 additions & 11 deletions cpp/src/arrow/util/value_parsing_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,17 +870,20 @@ TEST(TimestampParser, StrptimeParser) {
}

// Unparseable strings
std::vector<std::string> unparseables = {"foo", "5/1/2000", "5/1/2000 12:34:56:6",
// Impossible dates are rejected rather
// than rolled over into the next month
"2/30/2000 12:34:56", "4/31/2000 12:34:56",
"2/29/2001 12:34:56",
// A zero day is rejected rather than
// taken as the first of the month
"2/00/2000 12:34:56",
// A zero month is rejected rather than
// taken as December of the previous year
"0/15/2000 12:34:56"};
std::vector<std::string> unparseables = {
"foo", "5/1/2000", "5/1/2000 12:34:56:6",
// Impossible dates are rejected rather
// than rolled over into the next month
"2/30/2000 12:34:56", "4/31/2000 12:34:56", "2/29/2001 12:34:56",
// A zero day is rejected rather than
// taken as the first of the month
"2/00/2000 12:34:56",
// A zero month is rejected rather than
// taken as December of the previous year
"0/15/2000 12:34:56",
// Leap seconds are rejected, as by the
// ISO-8601 parser
"5/31/2000 12:30:60", "5/31/2000 23:59:60", "5/31/2000 23:59:61"};
for (auto& value : unparseables) {
int64_t dummy;
ASSERT_FALSE((*parser)(value.c_str(), value.size(), TimeUnit::SECOND, &dummy));
Expand Down
9 changes: 9 additions & 0 deletions cpp/src/gandiva/to_date_holder_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,15 @@ TEST_F(TestToDateHolder, TestSimpleDateTime) {
millis_since_epoch =
to_date(&execution_context_, s.data(), (int)s.length(), true, &out_valid);
EXPECT_EQ(millis_since_epoch, 534643200000);

// A leap second does not make the value invalid, as the time is ignored
EXPECT_OK_AND_ASSIGN(auto to_date_holder24,
ToDateHolder::Make("YYYY-MM-DD HH24:MI:SS", 1));
s = std::string("2020-12-31 23:59:60");
millis_since_epoch = (*to_date_holder24)(&execution_context_, s.data(), (int)s.length(),
true, &out_valid);
EXPECT_TRUE(out_valid);
EXPECT_EQ(millis_since_epoch, 1609372800000);
}

TEST_F(TestToDateHolder, TestSimpleDate) {
Expand Down
Loading