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

QtTest: Fix format error in _q_compareSequence()

Browse Source 
Commit 63295f43e70955a194602a7acf39013f124e14b7 changed the size:
placeholders to %lld, but wrapped only one of the arguments in
qlonglong. This causes 32-bit builds to read past the end of the
expectedSize variable.

Fix by wrapping the other, too.

Pick-to: 6.7 6.5 6.2 5.15
Change-Id: I9c23ab589c8895e8f038fb508e18ac3006fa4f8f
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
(cherry picked from commit 57eff5b092dbd692594125edc70d3efd898660ea)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2024-08-01 13:25:28 +02:00 committed by Qt Cherry-pick Bot
parent ac3af71d04
commit f92cab0bee
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/testlib/qtest.h
View File

@ -59,7 +59,7 @@ bool _q_compareSequence(ActualIterator actualIt, ActualIterator actualEnd,
" Actual (%s) size: %lld\n"
" Expected (%s) size: %lld",
actual, qlonglong(actualSize),
expected, expectedSize);
expected, qlonglong(expectedSize));
}
for (auto expectedIt = expectedBegin; isOk && expectedIt < expectedEnd; ++actualIt, ++expectedIt) {