FlapJackApps/libdivecomputer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the length of the Suunto DX gas change event.

Browse Source 
The Suunto DX uses 5 bytes for the 0x06 gas change event.
This commit is contained in:
Jef Driesen 2014-06-05 09:03:32 +02:00
parent 8a5bfc390d
commit bb2b64f5d7
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/suunto_d9_parser.c
View File

@ -482,6 +482,7 @@ suunto_d9_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_t ca
unsigned int seconds, type, unknown, heading;
unsigned int current, next;
unsigned int he, o2;
unsigned int length;
sample.event.time = 0;
sample.event.flags = 0;
@ -651,19 +652,27 @@ suunto_d9_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_t ca
offset += 2;
break;
case 0x06: // Gas Change
if (offset + 4 > size) {
if (parser->model == DX)
length = 5;
else
length = 4;
if (offset + length > size) {
ERROR (abstract->context, "Buffer overflow detected!");
return DC_STATUS_DATAFORMAT;
}
unknown = data[offset + 0];
he = data[offset + 1];
o2 = data[offset + 2];
seconds = data[offset + 3];
if (parser->model == DX) {
seconds = data[offset + 4];
} else {
seconds = data[offset + 3];
}
sample.event.type = SAMPLE_EVENT_GASCHANGE2;
sample.event.time = seconds;
sample.event.value = o2 | (he << 16);
if (callback) callback (DC_SAMPLE_EVENT, sample, userdata);
offset += 4;
offset += length;
break;
default:
WARNING (abstract->context, "Unknown event 0x%02x.", event);