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

TaskModel: Harden taskmodel

Browse Source 
Invalid positions should not happen, but handle them anyway if they do.
There is one report about a crash in the task model that may be related
to this.

Task-number: QTCREATORBUG-13861
Change-Id: Iae1b25974220d3622ecc39bd1a073c299b843fea
Reviewed-by: Sandro Mani <manisandro@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-02-04 14:41:55 +01:00
parent 7b462aa0bc
commit 380acb5baa
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/projectexplorer/taskmodel.cpp
View File

@@ -238,7 +238,8 @@ int TaskModel::columnCount(const QModelIndex &parent) const
QVariant TaskModel::data(const QModelIndex &index, int role) const
{
if (!index.isValid() || index.row() >= m_tasks.count() || index.column() != 0)
int row = index.row();
if (!index.isValid() || row < 0 || row >= m_tasks.count() || index.column() != 0)
return QVariant();
if (role == TaskModel::File)
@@ -264,9 +265,10 @@ QVariant TaskModel::data(const QModelIndex &index, int role) const
Task TaskModel::task(const QModelIndex &index) const
{
if (!index.isValid())
int row = index.row();
if (!index.isValid() || row < 0 || row >= m_tasks.count())
return Task();
return m_tasks.at(index.row());
return m_tasks.at(row);
}
QList<Core::Id> TaskModel::categoryIds() const
@@ -317,10 +319,11 @@ int TaskModel::sizeOfLineNumber(const QFont &font)
void TaskModel::setFileNotFound(const QModelIndex &idx, bool b)
{
if (idx.isValid() && idx.row() < m_tasks.count()) {
m_fileNotFound.insert(m_tasks[idx.row()].file.toUserOutput(), b);
emit dataChanged(idx, idx);
}
int row = idx.row();
if (!idx.isValid() || row < 0 || row >= m_tasks.count())
return;
m_fileNotFound.insert(m_tasks[row].file.toUserOutput(), b);
emit dataChanged(idx, idx);
}
/////