From f3cb9c6fab0aca4a3e45c07f238f1d4b1dc56f35 Mon Sep 17 00:00:00 2001 From: Berend De Schouwer Date: Fri, 25 Sep 2009 14:19:07 +0200 Subject: [PATCH] do not load wko files with zero records Includes a test wko file that previously caused a crash. --- src/WkoRideFile.cpp | 1 + src/test/rides/2008_06_25_20_59_49.wko | Bin 0 -> 51663 bytes 2 files changed, 1 insertion(+) create mode 100644 src/test/rides/2008_06_25_20_59_49.wko diff --git a/src/WkoRideFile.cpp b/src/WkoRideFile.cpp index 1258060e7..4908f1e83 100644 --- a/src/WkoRideFile.cpp +++ b/src/WkoRideFile.cpp @@ -207,6 +207,7 @@ WKO_UCHAR *WkoParseRawData(WKO_UCHAR *fb, RideFile *rideFile) * RUN THROUGH EACH RAW DATA RECORD *==============================================================================*/ rdist=rtime=0; + if (!records) return NULL; while (records) { unsigned int marker; diff --git a/src/test/rides/2008_06_25_20_59_49.wko b/src/test/rides/2008_06_25_20_59_49.wko new file mode 100644 index 0000000000000000000000000000000000000000..6bff2bcf06c1498a61e1f31f47a7984dc9a9495e GIT binary patch literal 51663 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 literal 0 HcmV?d00001