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

Add support for the new Mares Genius firmware

Browse Source 
The new Mares Genius firmware v01.02.00 has a header which is 10 bytes
larger. This difference is indicated with a change in the major version
from 0 to 1.
This commit is contained in:
Jef Driesen 2021-07-01 09:15:15 +02:00
parent cfc9ddc380
commit 5cb527d53c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mares_iconhd_parser.c
View File

@ -374,7 +374,7 @@ mares_genius_cache (mares_iconhd_parser_t *parser)
unsigned int type = array_uint16_le (data); unsigned int type = array_uint16_le (data);
unsigned int minor = data[2]; unsigned int minor = data[2];
unsigned int major = data[3]; unsigned int major = data[3];
if (type != 1 || major != 0 || minor > 1) { if (type != 1 || major > 1 || minor > 1) {
ERROR (abstract->context, "Unsupported object type (%u) or version (%u.%u).", ERROR (abstract->context, "Unsupported object type (%u) or version (%u.%u).",
type, major, minor); type, major, minor);
return DC_STATUS_DATAFORMAT; return DC_STATUS_DATAFORMAT;
@ -389,8 +389,14 @@ mares_genius_cache (mares_iconhd_parser_t *parser)
extra = 8; extra = 8;
} }
// The Genius header (v1.x) has 10 bytes more at the end.
unsigned int more = 0;
if (major == 1) {
more = 16;
}
// Get the header size. // Get the header size.
unsigned int headersize = 0xB8 + extra; unsigned int headersize = 0xB8 + extra + more;
if (headersize > size) { if (headersize > size) {
ERROR (abstract->context, "Buffer overflow detected!"); ERROR (abstract->context, "Buffer overflow detected!");
return DC_STATUS_DATAFORMAT; return DC_STATUS_DATAFORMAT;