Skip to content

GH-31374: [C++] Prevent strptime from normalizing invalid dates #50747

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
fallintoplace wants to merge 1 commit into
base: main
Choose a base branch
from
+27 −4
Open

GH-31374: [C++] Prevent strptime from normalizing invalid dates #50747

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
10 changes: 6 additions & 4 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 @@ -826,10 +826,12 @@ static inline bool ParseTimestampStrptime(const char* buf, size_t length,
if (!allow_trailing_chars && static_cast<size_t>(ret - clean_copy.c_str()) != length) {
return false;
}
// ignore the time part
arrow_vendored::date::sys_seconds secs =
arrow_vendored::date::sys_days(arrow_vendored::date::year(result.tm_year + 1900) /
(result.tm_mon + 1) / std::max(result.tm_mday, 1));
const auto ymd = arrow_vendored::date::year(result.tm_year + 1900) /
(result.tm_mon + 1) / std::max(result.tm_mday, 1);
if (ARROW_PREDICT_FALSE(!ymd.ok())) {
return false;
}
arrow_vendored::date::sys_seconds secs = arrow_vendored::date::sys_days(ymd);
if (!ignore_time_in_day) {
secs += (std::chrono::hours(result.tm_hour) + std::chrono::minutes(result.tm_min) +
std::chrono::seconds(result.tm_sec));
Expand Down
21 changes: 21 additions & 0 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 @@ -876,6 +876,27 @@ TEST(TimestampParser, StrptimeParser) {
}
}

TEST(TimestampParser, StrptimeParserCalendarDateValidation) {
std::string format = "%Y-%m-%d";
auto parser = TimestampParser::MakeStrptime(format);

for (const std::string& value : {"1999-02-30", "1999-02-29", "1900-02-29",
"2024-04-31"}) {
SCOPED_TRACE(value);
int64_t converted;
ASSERT_FALSE((*parser)(value.c_str(), value.size(), TimeUnit::SECOND, &converted));
}

for (const std::string& value : {"2000-02-29", "2024-04-30"}) {
SCOPED_TRACE(value);
int64_t converted, expected;
ASSERT_TRUE((*parser)(value.c_str(), value.size(), TimeUnit::SECOND, &converted));
ASSERT_TRUE(ParseTimestampISO8601(value.c_str(), value.size(), TimeUnit::SECOND,
&expected));
ASSERT_EQ(expected, converted);
}
}

TEST(TimestampParser, StrptimeZoneOffset) {
if (!kStrptimeSupportsZone) {
GTEST_SKIP() << "strptime does not support %z on this platform";
Expand Down
Loading