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

QListView: add assert for static analyzer

Browse Source 
The loop that initializes the item should execute at least once, so the pointer
should be pointing to something valid. The static analyzer doesn't see that,
and warns about unguarded access to the item pointer in report with hash
d008dbef4573afca54be0139e2971a4a. Add asserts for both the condition that makes
the loop run at least once, and for the item pointer not being nullptr.

Change-Id: I94b9f3db3b3ce3d82445cf66788c05854b441aaf
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
(cherry picked from commit ddc886d670694df9e400ea6f04f76df19d0e1145)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Volker Hilsheimer 2021-05-18 16:08:36 +02:00 committed by Qt Cherry-pick Bot
parent c5c2ca9e22
commit 3df2c4c992
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/itemviews/qlistview.cpp
View File

@ -3168,6 +3168,7 @@ void QIconModeViewBase::doDynamicLayout(const QListViewLayoutInfo &info)
QRect rect(QPoint(), topLeft); QRect rect(QPoint(), topLeft);
QListViewItem *item = nullptr; QListViewItem *item = nullptr;
Q_ASSERT(info.first <= info.last);
for (int row = info.first; row <= info.last; ++row) { for (int row = info.first; row <= info.last; ++row) {
item = &items[row]; item = &items[row];
if (isHidden(row)) { if (isHidden(row)) {
@ -3238,6 +3239,7 @@ void QIconModeViewBase::doDynamicLayout(const QListViewLayoutInfo &info)
flowPosition += deltaFlowPosition; // current position + item width + gap flowPosition += deltaFlowPosition; // current position + item width + gap
} }
} }
Q_ASSERT(item);
batchSavedDeltaSeg = deltaSegPosition; batchSavedDeltaSeg = deltaSegPosition;
batchStartRow = info.last + 1; batchStartRow = info.last + 1;
bool done = (info.last >= rowCount() - 1); bool done = (info.last >= rowCount() - 1);