mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-17 21:46:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup: fix possbile buffer overrun

Browse source 
No reason to mess around with a 5 byte buffer when we have a
proper buffer available to receive a possibly 8 byte output
based on the format string. And silences compiler warning.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder 2018-01-09 09:03:26 +01:00
parent 3e2caa468e
commit 0096284a8e
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/uemis.c
View file

@ -299,7 +299,6 @@ void uemis_parse_divelog_binary(char *base64, void *datap)
struct divecomputer *dc = &dive->dc; struct divecomputer *dc = &dive->dc;
int template, gasoffset; int template, gasoffset;
uint8_t active = 0; uint8_t active = 0;
char version[5];
datalen = uemis_convert_base64(base64, &data); datalen = uemis_convert_base64(base64, &data);
dive->dc.airtemp.mkelvin = C_to_mkelvin((*(uint16_t *)(data + 45)) / 10.0); dive->dc.airtemp.mkelvin = C_to_mkelvin((*(uint16_t *)(data + 45)) / 10.0);
@ -374,8 +373,8 @@ void uemis_parse_divelog_binary(char *base64, void *datap)
/* get data from the footer */ /* get data from the footer */
char buffer[24]; char buffer[24];
snprintf(version, sizeof(version), "%1u.%02u", data[18], data[17]); snprintf(buffer, sizeof(buffer), "%1u.%02u", data[18], data[17]);
add_extra_data(dc, "FW Version", version); add_extra_data(dc, "FW Version", buffer);
snprintf(buffer, sizeof(buffer), "%08x", *(uint32_t *)(data + 9)); snprintf(buffer, sizeof(buffer), "%08x", *(uint32_t *)(data + 9));
add_extra_data(dc, "Serial", buffer); add_extra_data(dc, "Serial", buffer);
snprintf(buffer, sizeof(buffer), "%d", *(uint16_t *)(data + i + 35)); snprintf(buffer, sizeof(buffer), "%d", *(uint16_t *)(data + i + 35));