Skip to content

fix: date validation reject invalid dates instead of silent normalization #315

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
lxy-9602 merged 6 commits into from
Jun 2, 2026
Merged

fix: date validation reject invalid dates instead of silent normalization #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8b753ed
fix: date validation reject invalid dates instead of silent normaliza…
dalingmeng May 28, 2026
2deeb12
Merge branch 'main' into fix/date-validation
dalingmeng May 28, 2026
d20a18d
Merge branch 'main' into fix/date-validation
lxy-9602 Jun 1, 2026
f7937a7
Merge branch 'main' into fix/date-validation
lxy-9602 Jun 1, 2026
a774649
Merge branch 'main' into fix/date-validation
lxy-9602 Jun 1, 2026
98e3d44
Merge branch 'main' into fix/date-validation
lxy-9602 Jun 1, 2026
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
8 changes: 6 additions & 2 deletions src/paimon/common/utils/string_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,10 @@ Result<int32_t> StringUtils::StringToDate(const std::string& str) {
if (ss.fail()) {
return Status::Invalid(fmt::format("failed to convert string '{}' to date", str));
}
int32_t orig_mon = timeinfo.tm_mon;
int32_t orig_mday = timeinfo.tm_mday;
std::time_t time = timegm(&timeinfo);
Comment thread
dalingmeng marked this conversation as resolved.
if (time == -1) {
if (time == -1 || timeinfo.tm_mon != orig_mon || timeinfo.tm_mday != orig_mday) {
return Status::Invalid(fmt::format("failed to convert string '{}' to date", str));
}
static const int64_t SECONDS_PER_DAY = 86400l; // = 24 * 60 * 60
Expand Down Expand Up @@ -207,8 +209,10 @@ Result<int64_t> StringUtils::StringToTimestampMillis(const std::string& str) {
str));
}

int32_t orig_mon = timeinfo.tm_mon;
int32_t orig_mday = timeinfo.tm_mday;
std::time_t time = mktime(&timeinfo);
if (time == -1) {
if (time == -1 || timeinfo.tm_mon != orig_mon || timeinfo.tm_mday != orig_mday) {
return Status::Invalid(fmt::format("failed to convert string '{}' to timestamp", str));
}
return static_cast<int64_t>(time) * 1000 + millis_part;
Expand Down
4 changes: 4 additions & 0 deletions src/paimon/common/utils/string_utils_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,8 @@ TEST_F(StringUtilsTest, TestStringToDate) {
ASSERT_NOK(StringUtils::StringToDate("-1970-01-02"));
ASSERT_NOK(StringUtils::StringToDate(""));
ASSERT_NOK(StringUtils::StringToDate("1970-XX-02"));
ASSERT_NOK(StringUtils::StringToDate("2023-02-29"));
ASSERT_NOK(StringUtils::StringToDate("2024-00-01"));
}

TEST_F(StringUtilsTest, TestStringToTimestampMillis) {
Expand Down Expand Up @@ -453,6 +455,8 @@ TEST_F(StringUtilsTest, TestStringToTimestampMillis) {
ASSERT_NOK(StringUtils::StringToTimestampMillis("2023-06-01 00:00:00.12 "));
// Trailing dot with no digits
ASSERT_NOK(StringUtils::StringToTimestampMillis("2023-06-01 00:00:00."));
ASSERT_NOK(StringUtils::StringToTimestampMillis("2023-02-29 12:00:00"));
ASSERT_NOK(StringUtils::StringToTimestampMillis("2024-00-15 00:00:00"));
}

TEST_F(StringUtilsTest, TestVectorToString) {
Expand Down
Loading