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

Fix Swim FIT parse crash

Browse Source 
.. not checking timeIndex() for out of bounds
   when secs goes negative during parsing.

.. also, enable interpolation for swim laps by
   default to ensure no data loss (i.e. don't
   insist on garmin smart recording setting).

Fixes #2953
This commit is contained in:
Mark Liversedge
2018-04-24 10:07:54 +01:00
parent 8f0fef686b
commit eb363c3fab
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/FileIO/FitRideFile.cpp
View File

@@ -1346,7 +1346,7 @@ struct FitFileReaderState
// s.t. Garmin 910xt
double secs = time - start_time;
if ((total_distance == 0.0) && (secs > last_time + 1) &&
(isGarminSmartRecording.toInt() != 0) &&
//(isGarminSmartRecording.toInt() != 0) && // always do this for swim laps
(secs - last_time < 100*GarminHWM.toInt())) {
double deltaSecs = secs - last_time;
for (int i = 1; i <= deltaSecs; i++) {
@@ -2154,7 +2154,7 @@ struct FitFileReaderState
if (secs>0) {
int idx = rideFile->timeIndex(round(secs));
if (rideFile->dataPoints().at(idx)->secs==secs)
if (idx < 0 || rideFile->dataPoints().at(idx)->secs==secs)
rideFile->appendOrUpdatePoint(
secs, 0.0, hr.at(i),
0.0,