From 31b8dffbb166ca04e4b9c2e1717ab613b26261b7 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 21 Apr 2015 23:31:03 -0700 Subject: Uemis downloader: don't use bogus sensor data from Uemis Sometimes we get a sensor number of 255 - which gets turned into a tank index and then causes all kinds of havoc. Simply refuse to use a tank number larger than the maximum Subsurface has been compiled for. Oh, and use consistent variables to handle these unsigned 8 bit integers. Signed-off-by: Dirk Hohndel --- uemis.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'uemis.c') diff --git a/uemis.c b/uemis.c index 690b1c98c..b2eda8f73 100644 --- a/uemis.c +++ b/uemis.c @@ -285,7 +285,7 @@ void uemis_parse_divelog_binary(char *base64, void *datap) struct dive *dive = datap; struct divecomputer *dc = &dive->dc; int template, gasoffset; - int active = 0; + uint8_t active = 0; char version[5]; datalen = uemis_convert_base64(base64, &data); @@ -334,10 +334,13 @@ void uemis_parse_divelog_binary(char *base64, void *datap) i = 0x123; u_sample = (uemis_sample_t *)(data + i); while ((i <= datalen) && (data[i] != 0 || data[i+1] != 0)) { - /* it seems that a dive_time of 0 indicates the end of the valid readings */ if (u_sample->active_tank != active) { - active = u_sample->active_tank; - add_gas_switch_event(dive, dc, u_sample->dive_time, active); + if (u_sample->active_tank >= MAX_CYLINDERS) { + fprintf(stderr, "got invalid sensor #%d was #%d\n", u_sample->active_tank, active); + } else { + active = u_sample->active_tank; + add_gas_switch_event(dive, dc, u_sample->dive_time, active); + } } sample = prepare_sample(dc); sample->time.seconds = u_sample->dive_time; -- cgit v1.2.3-70-g09d2