From 5adc3d2cfdd8b9ca6534198611d1af0d32a015cf Mon Sep 17 00:00:00 2001 From: Miika Turkia Date: Wed, 3 Dec 2014 20:47:40 +0200 Subject: Fix crash with converted DM5 log If DM4 log file is converted to DM5, the sampleBlob is empty. Signed-off-by: Miika Turkia Signed-off-by: Dirk Hohndel --- parse-xml.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'parse-xml.c') diff --git a/parse-xml.c b/parse-xml.c index 02236113a..a3461687d 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -2082,7 +2082,7 @@ extern int dm5_dive(void *param, int columns, char **data, char **column) interval = data[16] ? atoi(data[16]) : 0; sampleBlob = (unsigned const char *)data[17]; - for (i = 0; interval && i * interval < cur_dive->duration.seconds; i++) { + for (i = 0; interval && sampleBlob && i * interval < cur_dive->duration.seconds; i++) { float *depth = (float *)&sampleBlob[i * 16 + 3]; int32_t temp = (sampleBlob[i * 16 + 10] << 8) + sampleBlob[i * 16 + 11]; int32_t pressure = (sampleBlob[i * 16 + 9] << 16) + (sampleBlob[i * 16 + 8] << 8) + sampleBlob[i * 16 + 7]; -- cgit v1.2.3-70-g09d2