[PATCH 1/2] Fix crash with converted DM5 log
Miika Turkia
miika.turkia at gmail.com
Wed Dec 3 10:47:40 PST 2014
If DM4 log file is converted to DM5, the sampleBlob is empty.
Signed-off-by: Miika Turkia <miika.turkia at gmail.com>
---
parse-xml.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parse-xml.c b/parse-xml.c
index 0223611..a346168 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];
--
1.9.1
More information about the subsurface
mailing list