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

QTimer: clamp too-large milliseconds intervals to INT_MAX ms

Browse Source 
QTimer stores the interval in an int, a milliseconds interval that is
too-large will overflow and the value becomes negative. Clamp the
interval to INT_MAX ms. This also matches what QTimer::from_msecs()
does.

Amends f1f610bc67bfd5c2ef31270a6945e7bae93b5e4a.

Change-Id: Id925827f632e8a8d8b8b65e6a41e8f8722344c26
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Ahmad Samir 2025-02-05 22:48:09 +02:00
parent bb846a22c3
commit fce5fdb4d1
2 changed files with 47 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/corelib/kernel/qtimer.cpp
View File

@ -246,9 +246,14 @@ void QTimer::start(int msec)
static std::chrono::milliseconds static std::chrono::milliseconds
checkInterval(const char *caller, std::chrono::milliseconds interval) checkInterval(const char *caller, std::chrono::milliseconds interval)
{ {
constexpr auto maxInterval = INT_MAX * 1ms;
if (interval < 0ms) { if (interval < 0ms) {
qWarning("%s: negative intervals aren't allowed; the interval will be set to 1ms.", caller); qWarning("%s: negative intervals aren't allowed; the interval will be set to 1ms.", caller);
interval = 1ms; interval = 1ms;
} else if (interval > maxInterval) {
qWarning("%s: interval exceeds maximum allowed interval, it will be clamped to "
"INT_MAX ms (about 24 days).", caller);
interval = maxInterval;
} }
return interval; return interval;
} }
@ -276,9 +281,6 @@ void QTimer::start(std::chrono::milliseconds interval)
Q_D(QTimer); Q_D(QTimer);
interval = checkInterval("QTimer::start", interval); interval = checkInterval("QTimer::start", interval);
// This could be narrowing as the interval is stored in an `int` QProperty,
// and the type can't be changed in Qt6.
const int msec = interval.count(); const int msec = interval.count();
const bool intervalChanged = msec != d->inter; const bool intervalChanged = msec != d->inter;
d->inter.setValue(msec); d->inter.setValue(msec);
@ -645,9 +647,6 @@ void QTimer::setInterval(std::chrono::milliseconds interval)
Q_D(QTimer); Q_D(QTimer);
interval = checkInterval("QTimer::setInterval", interval); interval = checkInterval("QTimer::setInterval", interval);
// This could be narrowing as the interval is stored in an `int` QProperty,
// and the type can't be changed in Qt6.
const int msec = interval.count(); const int msec = interval.count();
d->inter.removeBindingUnlessInWrapper(); d->inter.removeBindingUnlessInWrapper();
const bool intervalChanged = msec != d->inter.valueBypassingBindings(); const bool intervalChanged = msec != d->inter.valueBypassingBindings();

42
tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
View File

@ -99,6 +99,8 @@ private slots:
void negativeInterval(); void negativeInterval();
void testTimerId(); void testTimerId();
void intervalOverflow();
}; };
void tst_QTimer::zeroTimer() void tst_QTimer::zeroTimer()
@ -1434,6 +1436,46 @@ void tst_QTimer::negativeInterval()
QCOMPARE(timer.intervalAsDuration(), 1ms); QCOMPARE(timer.intervalAsDuration(), 1ms);
} }
void tst_QTimer::intervalOverflow()
{
QTimer timer;
constexpr auto maxInterval = INT_MAX * 1ms;
constexpr auto tooBig = maxInterval + 1ms;
auto ignoreStartWarningMsg = [] {
QTest::ignoreMessage(QtWarningMsg,
"QTimer::start: interval exceeds maximum allowed interval, it will "
"be clamped to INT_MAX ms (about 24 days).");
};
auto ignoreSetIntervalWarningMsg = [] {
QTest::ignoreMessage(QtWarningMsg,
"QTimer::setInterval: interval exceeds maximum allowed interval, "
"it will be clamped to INT_MAX ms (about 24 days).");
};
ignoreStartWarningMsg();
timer.start(tooBig);
QVERIFY(timer.isActive());
// Interval clamped to INT_MAX * 1ms
QCOMPARE(timer.intervalAsDuration(), maxInterval);
timer.stop();
ignoreSetIntervalWarningMsg();
timer.setInterval(tooBig); // The same but with setInterval()
QCOMPARE(timer.intervalAsDuration(), maxInterval);
timer.start();
QVERIFY(timer.isActive());
timer.stop();
ignoreStartWarningMsg();
timer.start(tooBig + 10min);
QVERIFY(timer.isActive());
QCOMPARE(timer.intervalAsDuration(), maxInterval);
ignoreSetIntervalWarningMsg();
timer.setInterval(tooBig + 1h); // With an already running timer
QVERIFY(timer.isActive());
QCOMPARE(timer.intervalAsDuration(), maxInterval);
}
class OrderHelper : public QObject class OrderHelper : public QObject
{ {
Q_OBJECT Q_OBJECT