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

Relax the detection of the last dive.

Browse Source 
We received data from a Mares Smart where the existing heuristics to
detect the last dive are not sufficient. The very last check, where the
calculated and stored are compared results in a fatal error.
This commit is contained in:
Jef Driesen 2015-04-10 22:31:29 +02:00
parent 4797ad8d9e
commit 3a6206e72c
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mares_iconhd.c
View File

@ -538,15 +538,10 @@ mares_iconhd_extract_dives (dc_device_t *abstract, const unsigned char data[], u
// Verify that the length that is stored in the profile data
// equals the calculated length. If both values are different,
// something is wrong and an error is returned.
// we assume we reached the last dive.
unsigned int length = array_uint32_le (buffer + offset);
if (length == 0 || length == 0xFFFFFFFF)
if (length != nbytes)
break;
if (length != nbytes) {
ERROR (context, "Calculated and stored size are not equal.");
free (buffer);
return DC_STATUS_DATAFORMAT;
}
unsigned char *fp = buffer + offset + length - headersize + fingerprint;
if (device && memcmp (fp, device->fingerprint, sizeof (device->fingerprint)) == 0) {