nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 16:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

SrmRideFile: handle bad marker start

Browse Source 
Marker start wasn't check - so, it could point to data outside the array
and cause a crash.

This fixes #737
This commit is contained in:
Rainer Clasen
2012-10-22 09:26:55 +02:00
parent b9f1d601a0
commit cbc39d3750
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/SrmRideFile.cpp
View File

@@ -337,7 +337,7 @@ RideFile *SrmFileReader::openRideFile(QFile &file, QStringList &errorStrings, QL
double last = 0.0;
for (int i = 1; i < markers.size(); ++i) {
const marker &marker = markers[i];
int start = marker.start - 1;
int start = qMin(marker.start, result->dataPoints().size()) - 1;
double start_secs = result->dataPoints()[start]->secs;
int end = qMin(marker.end - 1, result->dataPoints().size() - 1);
double end_secs = result->dataPoints()[end]->secs + result->recIntSecs();
@@ -346,7 +346,8 @@ RideFile *SrmFileReader::openRideFile(QFile &file, QStringList &errorStrings, QL
QString note = QString("%1").arg(i);
if( marker.note.length() )
note += QString(" ") + marker.note;
result->addInterval(start_secs, end_secs, note );
if( start_secs <= end_secs )
result->addInterval(start_secs, end_secs, note );
last = end_secs;
}
if (!markers.empty() && markers.last().end < result->dataPoints().size()) {