summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2013-11-20 07:44:45 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-11-20 07:44:45 -0800
commit51345e4ad828918a4e20b6aba40c3b0a137b1e73 (patch)
treedc4507aadf8ab3efc0e6f5a936fcd90223bd1610
parent9c5e037a612808a9ad1d2c9f8e6ec7213d5d468b (diff)
downloadsubsurface-51345e4ad828918a4e20b6aba40c3b0a137b1e73.tar.gz
Fix potential crash in the per tank sac calculation
In an inconsistant XML file (like our own dives/test20.xml) it is possible that a gas change event refers to a non-existing gas. In that case get_gasidx returns -1 - which we shouldn't use as index into the arrays. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--dive.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/dive.c b/dive.c
index 52a2022ae..269aeb658 100644
--- a/dive.c
+++ b/dive.c
@@ -363,10 +363,11 @@ void per_cylinder_mean_depth(struct dive *dive, struct divecomputer *dc, int *me
if (ev && time >= ev->time.seconds) {
int o2 = (ev->value & 0xFFFF) * 10;
int he = (ev->value >> 16) * 10;
- idx = get_gasidx(dive, o2, he);
+ int tank = get_gasidx(dive, o2, he);
+ if (tank >= 0)
+ idx = tank; // should never happen unless the input file is inconsistent
ev = get_next_event(ev->next, "gaschange");
}
-
/* We ignore segments at the surface */
if (depth > SURFACE_THRESHOLD || lastdepth > SURFACE_THRESHOLD) {
duration[idx] += time - lasttime;