third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2146 from Exiv2/mainDatesWithZeros

Browse Source 
DateValue is now a bit more permissive with malformed dates
This commit is contained in:
Luis Díaz Más 2022-03-12 16:56:11 +01:00 committed by GitHub
commit 5d08bb9bec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/value.cpp
View File

@ -914,21 +914,35 @@ namespace Exiv2 {
{ {
// ISO 8601 date formats: // ISO 8601 date formats:
// https://web.archive.org/web/20171020084445/https://www.loc.gov/standards/datetime/ISO_DIS%208601-1.pdf // https://web.archive.org/web/20171020084445/https://www.loc.gov/standards/datetime/ISO_DIS%208601-1.pdf
static const std::regex reExtended(R"(^(\d{4})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01]))"); static const std::regex reExtended(R"(^(\d{4})-(\d{2})-(\d{2}))");
static const std::regex reBasic(R"(^(\d{4})(0[1-9]|1[0-2])(0[1-9]|[12][0-9]|3[01]))"); static const std::regex reBasic(R"(^(\d{4})(\d{2})(\d{2}))");
std::smatch sm; std::smatch sm;
auto printWarning = [](){
#ifndef SUPPRESS_WARNINGS
EXV_WARNING << Error(kerUnsupportedDateFormat) << "\n";
#endif
};
// Note: We use here regex_search instead of regex_match, because the string can be longer than expected and // Note: We use here regex_search instead of regex_match, because the string can be longer than expected and
// also contain the time // also contain the time
if (std::regex_search(buf, sm, reExtended) || std::regex_search(buf, sm, reBasic)) { if (std::regex_search(buf, sm, reExtended) || std::regex_search(buf, sm, reBasic)) {
date_.year = std::stoi(sm[1].str()); date_.year = std::stoi(sm[1].str());
date_.month = std::stoi(sm[2].str()); date_.month = std::stoi(sm[2].str());
date_.day = std::stoi(sm[3].str()); if (date_.month > 12) {
return 0; date_.month = 0;
printWarning();
return 1;
}
date_.day = std::stoi(sm[3].str());
if (date_.day > 31) {
date_.day = 0;
printWarning();
return 1;
}
return 0;
} }
#ifndef SUPPRESS_WARNINGS printWarning();
EXV_WARNING << Error(kerUnsupportedDateFormat) << "\n";
#endif
return 1; return 1;
} }

21
unitTests/test_DateValue.cpp
View File

@ -101,6 +101,16 @@ TEST(ADateValue, readFromStringWithExpectedSizeAndDashes)
ASSERT_EQ(2, dateValue.getDate().day); ASSERT_EQ(2, dateValue.getDate().day);
} }
TEST(ADateValue, readFromStringWithExpectedSizeAndDashesAndZeroes)
{
DateValue dateValue;
const std::string date ("2018-00-00");
ASSERT_EQ(0, dateValue.read(date));
ASSERT_EQ(2018, dateValue.getDate().year);
ASSERT_EQ(0, dateValue.getDate().month);
ASSERT_EQ(0, dateValue.getDate().day);
}
TEST(ADateValue, readFromStringWithExpectedSizeWithoutDashes) TEST(ADateValue, readFromStringWithExpectedSizeWithoutDashes)
{ {
DateValue dateValue; DateValue dateValue;
@ -111,6 +121,17 @@ TEST(ADateValue, readFromStringWithExpectedSizeWithoutDashes)
ASSERT_EQ(2, dateValue.getDate().day); ASSERT_EQ(2, dateValue.getDate().day);
} }
TEST(ADateValue, readFromStringWithExpectedSizeWithoutDashesAndZeroes)
{
DateValue dateValue;
const std::string date ("20180000");
ASSERT_EQ(0, dateValue.read(date));
ASSERT_EQ(2018, dateValue.getDate().year);
ASSERT_EQ(0, dateValue.getDate().month);
ASSERT_EQ(0, dateValue.getDate().day);
}
TEST(ADateValue, readFromStringWithTime) TEST(ADateValue, readFromStringWithTime)
{ {
DateValue dateValue; DateValue dateValue;