FlapJackApps/subsurface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Models: fix two potential crashes

Browse Source 
CylinderModels::setDive() and WeightModel::setDive() have
potential to pass the 'last' argument to beginInsertRows() as
a negative number which triggers an assert that 'last' cannot
be smaller than 'first'.

Patch attempts to fix that by only calling beginInsertRows()
when there is at least one row to insert.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Lubomir I. Ivanov 2013-10-13 16:20:32 +03:00 committed by Dirk Hohndel
parent d23266ad51
commit a2a93ff04b
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qt-ui/models.cpp
View File

@ -323,12 +323,13 @@ void CylindersModel::setDive(dive* d)
break;
}
}
beginInsertRows(QModelIndex(), 0, amount-1);
rows = amount;
current = d;
changed = false;
endInsertRows();
if (amount > 0) {
beginInsertRows(QModelIndex(), 0, amount - 1);
endInsertRows();
}
}
Qt::ItemFlags CylindersModel::flags(const QModelIndex& index) const
@ -504,12 +505,13 @@ void WeightModel::setDive(dive* d)
break;
}
}
beginInsertRows(QModelIndex(), 0, amount-1);
rows = amount;
current = d;
changed = false;
endInsertRows();
if (amount > 0) {
beginInsertRows(QModelIndex(), 0, amount - 1);
endInsertRows();
}
}
WSInfoModel* WSInfoModel::instance()