1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix more mis-handling of spaces in ISO date format strings

Browse Source 
ISO date format doesn't allow spaces within a date, although 3339 does
allow a space to replace the T between date and time. Sixteen tests
added to check this all failed. So clean up the handling of spaces in
the parsing of ISO date-time strings.

[ChangeLog][QtCore][QDateTime] ISO 8601: parsing of dates now requires
a punctuator as separator (it previously allowed any non-digit;
officially only a dash should be allowed) and parsing of date-times no
longer tolerates spaces in the numeric fields: an internal space is
only allowed in an ISO 8601 date-time as replacement for the T between
date and time.

Change-Id: I24d110e71d416ecef74e196d5ee270b59d1bd813
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2019-12-02 16:15:14 +01:00
parent c5777ad81c
commit bf65c27789
2 changed files with 107 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
src/corelib/time/qdatetime.cpp
View File

@ -1626,6 +1626,29 @@ qint64 QDate::daysTo(const QDate &d) const
*/ */
#if QT_CONFIG(datestring) #if QT_CONFIG(datestring)
namespace {
struct ParsedInt { int value = 0; bool ok = false; };
/*
/internal
Read an int that must be the whole text. QStringRef::toInt() will ignore
spaces happily; but ISO date format should not.
*/
ParsedInt readInt(QStringView text)
{
ParsedInt result;
for (const auto &ch : text) {
if (ch.isSpace())
return result;
}
result.value = QLocale::c().toInt(text, &result.ok);
return result;
}
}
/*! /*!
Returns the QDate represented by the \a string, using the Returns the QDate represented by the \a string, using the
\a format given, or an invalid date if the string cannot be \a format given, or an invalid date if the string cannot be
@ -1677,17 +1700,18 @@ QDate QDate::fromString(const QString &string, Qt::DateFormat format)
return QDate(year, month, day); return QDate(year, month, day);
} }
#endif // textdate #endif // textdate
case Qt::ISODate: { case Qt::ISODate:
// Semi-strict parsing, must be long enough and have non-numeric separators // Semi-strict parsing, must be long enough and have punctuators as separators
if (string.size() < 10 || string.at(4).isDigit() || string.at(7).isDigit() if (string.size() >= 10 && string.at(4).isPunct() && string.at(7).isPunct()
|| (string.size() > 10 && string.at(10).isDigit())) { && (string.size() == 10 || !string.at(10).isDigit())) {
return QDate(); QStringView view(string);
} const ParsedInt year = readInt(view.mid(0, 4));
const int year = string.midRef(0, 4).toInt(); const ParsedInt month = readInt(view.mid(5, 2));
if (year <= 0 || year > 9999) const ParsedInt day = readInt(view.mid(8, 2));
return QDate(); if (year.ok && year.value > 0 && year.value <= 9999 && month.ok && day.ok)
return QDate(year, string.midRef(5, 2).toInt(), string.midRef(8, 2).toInt()); return QDate(year.value, month.value, day.value);
} }
break;
} }
return QDate(); return QDate();
} }
@ -2331,17 +2355,15 @@ static QTime fromIsoTimeString(QStringView string, Qt::DateFormat format, bool *
*isMidnight24 = false; *isMidnight24 = false;
const int size = string.size(); const int size = string.size();
if (size < 5) if (size < 5 || string.at(2) != QLatin1Char(':'))
return QTime(); return QTime();
const QLocale C(QLocale::c()); ParsedInt hour = readInt(string.mid(0, 2));
bool ok = false; ParsedInt minute = readInt(string.mid(3, 2));
int hour = C.toInt(string.mid(0, 2), &ok); if (!hour.ok || !minute.ok)
if (!ok)
return QTime();
const int minute = C.toInt(string.mid(3, 2), &ok);
if (!ok)
return QTime(); return QTime();
// FIXME: ISO 8601 allows [,.]\d+ after hour, just as it does after minute
int second = 0; int second = 0;
int msec = 0; int msec = 0;
@ -2361,44 +2383,56 @@ static QTime fromIsoTimeString(QStringView string, Qt::DateFormat format, bool *
// will then be rounded up AND clamped to 999. // will then be rounded up AND clamped to 999.
const QStringView minuteFractionStr = string.mid(6, qMin(qsizetype(5), string.size() - 6)); const QStringView minuteFractionStr = string.mid(6, qMin(qsizetype(5), string.size() - 6));
const long minuteFractionInt = C.toLong(minuteFractionStr, &ok); const ParsedInt parsed = readInt(minuteFractionStr);
if (!ok) if (!parsed.ok)
return QTime(); return QTime();
const float minuteFraction = double(minuteFractionInt) / (std::pow(double(10), minuteFractionStr.size())); const float secondWithMs
= double(parsed.value) * 60 / (std::pow(double(10), minuteFractionStr.size()));
const float secondWithMs = minuteFraction * 60; second = std::floor(secondWithMs);
const float secondNoMs = std::floor(secondWithMs); const float secondFraction = secondWithMs - second;
const float secondFraction = secondWithMs - secondNoMs;
second = secondNoMs;
msec = qMin(qRound(secondFraction * 1000.0), 999); msec = qMin(qRound(secondFraction * 1000.0), 999);
} else { } else if (string.at(5) == QLatin1Char(':')) {
// HH:mm:ss or HH:mm:ss.zzz // HH:mm:ss or HH:mm:ss.zzz
second = C.toInt(string.mid(6, qMin(qsizetype(2), string.size() - 6)), &ok); const ParsedInt parsed = readInt(string.mid(6, qMin(qsizetype(2), string.size() - 6)));
if (!ok) if (!parsed.ok)
return QTime(); return QTime();
if (size > 8 && (string.at(8) == QLatin1Char(',') || string.at(8) == QLatin1Char('.'))) { second = parsed.value;
if (size <= 8) {
// No fractional part to read
} else if (string.at(8) == QLatin1Char(',') || string.at(8) == QLatin1Char('.')) {
QStringView msecStr(string.mid(9, qMin(qsizetype(4), string.size() - 9))); QStringView msecStr(string.mid(9, qMin(qsizetype(4), string.size() - 9)));
// toInt() ignores leading spaces, so catch them before calling it bool ok = true;
// Can't use readInt() here, as we *do* allow trailing space - but not leading:
if (!msecStr.isEmpty() && !msecStr.at(0).isDigit()) if (!msecStr.isEmpty() && !msecStr.at(0).isDigit())
return QTime(); return QTime();
// We do, however, want to ignore *trailing* spaces.
msecStr = msecStr.trimmed(); msecStr = msecStr.trimmed();
int msecInt = msecStr.isEmpty() ? 0 : C.toInt(msecStr, &ok); int msecInt = msecStr.isEmpty() ? 0 : QLocale::c().toInt(msecStr, &ok);
if (!ok) if (!ok)
return QTime(); return QTime();
const double secondFraction(msecInt / (std::pow(double(10), msecStr.size()))); const double secondFraction(msecInt / (std::pow(double(10), msecStr.size())));
msec = qMin(qRound(secondFraction * 1000.0), 999); msec = qMin(qRound(secondFraction * 1000.0), 999);
} else {
#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) // behavior change
// Stray cruft after date-time: tolerate trailing space, but nothing else.
for (const auto &ch : string.mid(8)) {
if (!ch.isSpace())
return QTime();
} }
#endif
}
} else {
return QTime();
} }
const bool isISODate = format == Qt::ISODate || format == Qt::ISODateWithMs; const bool isISODate = format == Qt::ISODate || format == Qt::ISODateWithMs;
if (isISODate && hour == 24 && minute == 0 && second == 0 && msec == 0) { if (isISODate && hour.value == 24 && minute.value == 0 && second == 0 && msec == 0) {
if (isMidnight24) if (isMidnight24)
*isMidnight24 = true; *isMidnight24 = true;
hour = 0; hour.value = 0;
} }
return QTime(hour, minute, second, msec); return QTime(hour.value, minute.value, second, msec);
} }
/*! /*!

38
tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
View File

@ -2213,8 +2213,46 @@ void tst_QDateTime::fromStringDateFormat_data()
QTest::newRow("trailing space") // QTBUG-80445 QTest::newRow("trailing space") // QTBUG-80445
<< QString("2000-01-02 03:04:05.678 ") << QString("2000-01-02 03:04:05.678 ")
<< Qt::ISODate << QDateTime(QDate(2000, 1, 2), QTime(3, 4, 5, 678)); << Qt::ISODate << QDateTime(QDate(2000, 1, 2), QTime(3, 4, 5, 678));
// Invalid spaces (but keeping field widths correct):
QTest::newRow("space before millis") QTest::newRow("space before millis")
<< QString("2000-01-02 03:04:05. 678") << Qt::ISODate << QDateTime(); << QString("2000-01-02 03:04:05. 678") << Qt::ISODate << QDateTime();
QTest::newRow("space after seconds")
<< QString("2000-01-02 03:04:5 .678") << Qt::ISODate << QDateTime();
QTest::newRow("space before seconds")
<< QString("2000-01-02 03:04: 5.678") << Qt::ISODate << QDateTime();
QTest::newRow("space after minutes")
<< QString("2000-01-02 03:4 :05.678") << Qt::ISODate << QDateTime();
QTest::newRow("space before minutes")
<< QString("2000-01-02 03: 4:05.678") << Qt::ISODate << QDateTime();
QTest::newRow("space after hour")
<< QString("2000-01-02 3 :04:05.678") << Qt::ISODate << QDateTime();
QTest::newRow("space before hour")
<< QString("2000-01-02 3:04:05.678") << Qt::ISODate << QDateTime();
QTest::newRow("space after day")
<< QString("2000-01-2 03:04:05.678") << Qt::ISODate << QDateTime();
QTest::newRow("space before day")
<< QString("2000-01- 2 03:04:05.678") << Qt::ISODate << QDateTime();
QTest::newRow("space after month")
<< QString("2000-1 -02 03:04:05.678") << Qt::ISODate << QDateTime();
QTest::newRow("space before month")
<< QString("2000- 1-02 03:04:05.678") << Qt::ISODate << QDateTime();
QTest::newRow("space after year")
<< QString("200 -01-02 03:04:05.678") << Qt::ISODate << QDateTime();
// Spaces as separators:
QTest::newRow("sec-milli space")
<< QString("2000-01-02 03:04:05 678") << Qt::ISODate
// Should be invalid, but we ignore trailing cruft (in some cases)
<< QDateTime(QDate(2000, 1, 2), QTime(3, 4, 5));
QTest::newRow("min-sec space")
<< QString("2000-01-02 03:04 05.678") << Qt::ISODate << QDateTime();
QTest::newRow("hour-min space")
<< QString("2000-01-02 03 04:05.678") << Qt::ISODate << QDateTime();
QTest::newRow("mon-day space")
<< QString("2000-01 02 03:04:05.678") << Qt::ISODate << QDateTime();
QTest::newRow("year-mon space")
<< QString("2000 01-02 03:04:05.678") << Qt::ISODate << QDateTime();
// Normal usage: // Normal usage:
QTest::newRow("ISO +01:00") << QString::fromLatin1("1987-02-13T13:24:51+01:00") QTest::newRow("ISO +01:00") << QString::fromLatin1("1987-02-13T13:24:51+01:00")