prepare_sample reallocs the dive - don't keep pointers around

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>

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