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

Handle partial dives near the end of the ringbuffer correctly.

Browse Source
This commit is contained in:
Jef Driesen 2008-12-23 17:38:39 +00:00
parent 6242ba9a13
commit 471f079c2e
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mares_nemo.c
View File

@ -292,13 +292,12 @@ mares_nemo_extract_dives (const unsigned char data[], unsigned int size, dive_ca
unsigned int nsamples = buffer[offset - 3] + (buffer[offset - 2] << 8); unsigned int nsamples = buffer[offset - 3] + (buffer[offset - 2] << 8);
// Calculate the total number of bytes for this dive. // Calculate the total number of bytes for this dive.
// If the buffer does not contain that much bytes, something // If the buffer does not contain that much bytes, we reached the
// is wrong and an error is returned. // end of the ringbuffer. The current dive is incomplete (partially
// overwritten with newer data), and processing should stop.
unsigned int nbytes = 2 + nsamples * sample_size + header_size; unsigned int nbytes = 2 + nsamples * sample_size + header_size;
if (offset < nbytes) { if (offset < nbytes)
WARNING ("Ringbuffer contains fewer bytes than required."); break;
return DEVICE_STATUS_ERROR;
}
// Move to the start of the dive. // Move to the start of the dive.
offset -= nbytes; offset -= nbytes;