From: Dirk Hohndel <dirk@hohndel.org>
Date: Sun, 2 Oct 2011 17:30:02 +0000 (-0700)
Subject: prepare_sample reallocs the dive - don't keep pointers around
X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=commitdiff_plain;h=fe0eff8f1ef6f5bd73a0b89d3ac5fc334650c184

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 8dfc5a3..25d1b8a 100644
--- 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;