summaryrefslogtreecommitdiffstats
path: root/core/import-divinglog.c
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2019-08-04 22:13:49 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-11-09 19:19:04 +0100
commit794066b2367082851858d4e0da8b6e388d2acabb (patch)
tree81aad4f5e50c096a25d4bf59491a05ec250b6bc9 /core/import-divinglog.c
parent52d8d89f73542eb8ab3577bc55b466e7ca73bfc7 (diff)
downloadsubsurface-794066b2367082851858d4e0da8b6e388d2acabb.tar.gz
Cylinders: access cylinders with get_cylinder()
Instead of accessing the cylinder table directly, use the get_cylinder() function. This gives less unwieldy expressions. But more importantly, the function does bound checking. This is crucial for now as the code hasn't be properly audited since the change to arbitrarily sized cylinder tables. Accesses of invalid cylinder indexes may lead to silent data-corruption that is sometimes not even noticed by valgrind. Returning NULL instead of an invalid pointer will make debugging much easier. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/import-divinglog.c')
-rw-r--r--core/import-divinglog.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/import-divinglog.c b/core/import-divinglog.c
index 5b9e4be3b..f3a62eaff 100644
--- a/core/import-divinglog.c
+++ b/core/import-divinglog.c
@@ -130,7 +130,7 @@ static int divinglog_profile(void *param, int columns, char **data, char **colum
state->cur_sample->pressure[0].mbar = pressure * 100;
state->cur_sample->rbt.seconds = rbt;
if (oldcyl != tank && tank >= 0 && tank < state->cur_dive->cylinders.nr) {
- struct gasmix mix = state->cur_dive->cylinders.cylinders[tank].gasmix;
+ struct gasmix mix = get_cylinder(state->cur_dive, tank)->gasmix;
int o2 = get_o2(mix);
int he = get_he(mix);