mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-07 23:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

prepare_sample reallocs the dive - don't keep pointers around

Browse source 
Thanks Valgrind

This diff looks pointless at first until you see that I reference dive
again earlier in the loop and then after the end of the loop.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2011-10-02 10:30:02 -07:00
parent 9d8bdee350
commit fe0eff8f1e
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
uemis.c
View file

@ -220,12 +220,13 @@ static void parse_divelog_binary(char *base64, struct dive **divep) {
if (*(uint16_t *)(data+i) > dive->duration.seconds + 180) if (*(uint16_t *)(data+i) > dive->duration.seconds + 180)
break; break;
sample = prepare_sample(divep); sample = prepare_sample(divep);
dive = *divep; /* prepare_sample might realloc the dive */
sample->time.seconds = *(uint16_t *)(data+i); sample->time.seconds = *(uint16_t *)(data+i);
sample->depth.mm = pressure_to_depth(*(uint16_t *)(data+i+2)); sample->depth.mm = pressure_to_depth(*(uint16_t *)(data+i+2));
sample->temperature.mkelvin = (*(uint16_t *)(data+i+4) * 100) + 273150; sample->temperature.mkelvin = (*(uint16_t *)(data+i+4) * 100) + 273150;
sample->cylinderpressure.mbar= *(uint16_t *)(data+i+23) * 10; sample->cylinderpressure.mbar= *(uint16_t *)(data+i+23) * 10;
sample->cylinderindex = *(uint8_t *)(data+i+22); sample->cylinderindex = *(uint8_t *)(data+i+22);
finish_sample(*divep, sample); finish_sample(dive, sample);
i += 0x25; i += 0x25;
} }
dive->duration.seconds = sample->time.seconds - 1; dive->duration.seconds = sample->time.seconds - 1;