diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2020-11-24 12:45:11 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-11-27 19:07:06 +0000 |
commit | a754477b734661bc0850fb36b3fc4b55445ff2c2 (patch) | |
tree | 593fac64ae4b290dccc4dd5af16382077e2d4672 | |
parent | 59383960112ce79cf1efcfb55df1dfb522fd7e20 (diff) |
Bounds-check time-zone offsets when parsing
Parsing of time-zone offsets should check the offset string conforms
to the expected format and has valid values in its fields. The
QDateTime parser, fromOffsetString(), neglected the bounds check on
hours; the QTzTimeZonePrivate parser, parsePosixTime(), neglected all
upper bounds checks, only checking against negative valus.
Drive-by - refined phrasing of a comment.
Fixes: QTBUG-88656
Change-Id: If04cdbe65064108eaa87c42310527783ad21b4c0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 380d97e1bd15e753907c378a070bdf7f1c1cf06e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/corelib/time/qdatetime.cpp | 2 | ||||
-rw-r--r-- | src/corelib/time/qtimezoneprivate_tz.cpp | 27 |
2 files changed, 17 insertions, 12 deletions
diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp index 51a52a01df..757636ede2 100644 --- a/src/corelib/time/qdatetime.cpp +++ b/src/corelib/time/qdatetime.cpp @@ -319,7 +319,7 @@ static int fromOffsetString(QStringView offsetString, bool *valid) noexcept const QStringView hhRef = time.first(qMin(hhLen, time.size())); bool ok = false; const int hour = hhRef.toInt(&ok); - if (!ok) + if (!ok || hour > 23) // More generous than QTimeZone::MaxUtcOffsetSecs return 0; const QStringView mmRef = time.sliced(qMin(mmIndex, time.size())); diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp index 9cc477d2a5..50f24346d5 100644 --- a/src/corelib/time/qtimezoneprivate_tz.cpp +++ b/src/corelib/time/qtimezoneprivate_tz.cpp @@ -395,29 +395,34 @@ static int parsePosixTime(const char *begin, const char *end) // Format "hh[:mm[:ss]]" int hour, min = 0, sec = 0; - // Note that the calls to qstrtoll do *not* check the end pointer, which - // means they proceed until they find a non-digit. We check that we're - // still in range at the end, but we may have read from past end. It's the - // caller's responsibility to ensure that begin is part of a - // null-terminated string. + // Note that the calls to qstrtoll do *not* check against the end pointer, + // which means they proceed until they find a non-digit. We check that we're + // still in range at the end, but we may have read past end. It's the + // caller's responsibility to ensure that begin is part of a null-terminated + // string. + const int maxHour = QTimeZone::MaxUtcOffsetSecs / 3600; bool ok = false; - hour = qstrtoll(begin, &begin, 10, &ok); - if (!ok || hour < 0) + const char *cut = begin; + hour = qstrtoll(begin, &cut, 10, &ok); + if (!ok || hour < 0 || hour > maxHour || cut > begin + 2) return INT_MIN; + begin = cut; if (begin < end && *begin == ':') { // minutes ++begin; - min = qstrtoll(begin, &begin, 10, &ok); - if (!ok || min < 0) + min = qstrtoll(begin, &cut, 10, &ok); + if (!ok || min < 0 || min > 59 || cut > begin + 2) return INT_MIN; + begin = cut; if (begin < end && *begin == ':') { // seconds ++begin; - sec = qstrtoll(begin, &begin, 10, &ok); - if (!ok || sec < 0) + sec = qstrtoll(begin, &cut, 10, &ok); + if (!ok || sec < 0 || sec > 59 || cut > begin + 2) return INT_MIN; + begin = cut; } } |