mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-01 01:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make sure the index is valid

Browse source 
There are reports that the replace calls can cause the application to
crash. This doesn't seem to make sense, looking at the code - this change
shouldn't make any difference. But it makes it even more clear that there
shouldn't be any possible scenario in which we call replace with an index
that's out of range.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-01-29 15:26:24 -08:00
parent cd992bd14a
commit 07e94c67e0
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
qt-ui/divelogimportdialog.cpp
View file

@ -469,23 +469,23 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
// now set up time, depth, temperature, po2, cns, ndl, tts, stopdepth, pressure
for (int i = 0; i < currColumns.count(); i++)
headers.append("");
if (CSVApps[value].time != -1 && CSVApps[value].time < currColumns.count())
if (CSVApps[value].time > -1 && CSVApps[value].time < currColumns.count())
headers.replace(CSVApps[value].time, tr("Sample time"));
if (CSVApps[value].depth != -1 && CSVApps[value].depth < currColumns.count())
if (CSVApps[value].depth > -1 && CSVApps[value].depth < currColumns.count())
headers.replace(CSVApps[value].depth, tr("Sample depth"));
if (CSVApps[value].temperature != -1 && CSVApps[value].temperature < currColumns.count())
if (CSVApps[value].temperature > -1 && CSVApps[value].temperature < currColumns.count())
headers.replace(CSVApps[value].temperature, tr("Sample temperature"));
if (CSVApps[value].po2 != -1 && CSVApps[value].po2 < currColumns.count())
if (CSVApps[value].po2 > -1 && CSVApps[value].po2 < currColumns.count())
headers.replace(CSVApps[value].po2, tr("Sample pO₂"));
if (CSVApps[value].cns != -1 && CSVApps[value].cns < currColumns.count())
if (CSVApps[value].cns > -1 && CSVApps[value].cns < currColumns.count())
headers.replace(CSVApps[value].cns, tr("Sample CNS"));
if (CSVApps[value].ndl != -1 && CSVApps[value].ndl < currColumns.count())
if (CSVApps[value].ndl > -1 && CSVApps[value].ndl < currColumns.count())
headers.replace(CSVApps[value].ndl, tr("Sample NDL"));
if (CSVApps[value].tts != -1 && CSVApps[value].tts < currColumns.count())
if (CSVApps[value].tts > -1 && CSVApps[value].tts < currColumns.count())
headers.replace(CSVApps[value].tts, tr("Sample TTS"));
if (CSVApps[value].stopdepth != -1 && CSVApps[value].stopdepth < currColumns.count())
if (CSVApps[value].stopdepth > -1 && CSVApps[value].stopdepth < currColumns.count())
headers.replace(CSVApps[value].stopdepth, tr("Sample stopdepth"));
if (CSVApps[value].pressure != -1 && CSVApps[value].pressure < currColumns.count())
if (CSVApps[value].pressure > -1 && CSVApps[value].pressure < currColumns.count())
headers.replace(CSVApps[value].pressure, tr("Sample pressure"));
}