mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix potential crash in getColor functions

Browse source 
If the index is out of range, just return black.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-01-18 14:35:31 -08:00
parent 2c6830c399
commit 733108b473
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qt-ui/diveplanner.cpp
View file

@ -45,7 +45,9 @@ QString dpGasToStr(const divedatapoint& p)
QColor getColor(const color_indice_t i) QColor getColor(const color_indice_t i)
{ {
if ( profile_color.count() > i && i >= 0)
return profile_color[i].at(0); return profile_color[i].at(0);
return QColor(Qt::black);
} }
static DivePlannerPointsModel *plannerModel = DivePlannerPointsModel::instance(); static DivePlannerPointsModel *plannerModel = DivePlannerPointsModel::instance();

2
qt-ui/graphicsview-common.cpp
View file

@ -58,5 +58,7 @@ void fill_profile_color()
QColor getColor(const color_indice_t i, bool isGrayscale = false) QColor getColor(const color_indice_t i, bool isGrayscale = false)
{ {
if (profile_color.count() > i && i >= 0)
return profile_color[i].at((isGrayscale) ? 1 : 0); return profile_color[i].at((isGrayscale) ? 1 : 0);
return QColor(Qt::black);
} }