smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace assert with bounds check and qFatal

Browse source
This commit is contained in:
Nick Bolton 2024-07-30 00:04:57 +01:00
parent 6b803618e9
commit 7c40a4d198
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/gui/src/ScreenSetupModel.cpp
View file

@ -33,13 +33,18 @@ ScreenSetupModel::ScreenSetupModel(
// bound rows and columns to prevent multiply overflow. // bound rows and columns to prevent multiply overflow.
// this is unlikely to happen, as the grid size is only 3x9. // this is unlikely to happen, as the grid size is only 3x9.
assert(m_NumColumns < 100 && m_NumRows < 100); if (m_NumColumns > 100 || m_NumRows > 100) {
if (m_NumColumns * m_NumRows > screens.size())
qFatal( qFatal(
"Not enough elements (%lld) in screens QList for %d columns and %d " "Grid size out of bounds: %d columns x %d rows", m_NumColumns,
"rows", m_NumRows);
screens.size(), m_NumColumns, m_NumRows); return;
}
if (m_NumColumns * m_NumRows > screens.size()) {
qFatal(
"Scrren list (%lld) too small for %d columns x %d rows", screens.size(),
m_NumColumns, m_NumRows);
}
} }
QVariant ScreenSetupModel::data(const QModelIndex &index, int role) const { QVariant ScreenSetupModel::data(const QModelIndex &index, int role) const {