feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TestEditor/ModelAdapter: Fix model to pass the model test.

Browse Source 
Check for invalid (top level) or valid indexes in the overridden
functions. This prevents crashes due to accessibility traversing
the model.

Task-number: QTCREATORBUG-13142
Change-Id: I22d0831338436479e6ec3b215514bbb9513dffc7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Friedemann Kleint
2016-04-28 14:50:13 +02:00
parent 89aa06e37d
commit 71dd7102f8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/texteditor/codeassist/genericproposalwidget.cpp
View File

@@ -117,14 +117,14 @@ ModelAdapter::ModelAdapter(GenericProposalModel *completionModel, QWidget *paren
, m_completionModel(completionModel) , m_completionModel(completionModel)
{} {}
int ModelAdapter::rowCount(const QModelIndex &) const int ModelAdapter::rowCount(const QModelIndex &index) const
{ {
return m_completionModel->size(); return index.isValid() ? 0 : m_completionModel->size();
} }
QVariant ModelAdapter::data(const QModelIndex &index, int role) const QVariant ModelAdapter::data(const QModelIndex &index, int role) const
{ {
if (index.row() >= m_completionModel->size()) if (!index.isValid() || index.row() >= m_completionModel->size())
return QVariant(); return QVariant();
if (role == Qt::DisplayRole) if (role == Qt::DisplayRole)