diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-08-04 22:13:49 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-11-09 19:19:04 +0100 |
| commit | 794066b2367082851858d4e0da8b6e388d2acabb (patch) | |
| tree | 81aad4f5e50c096a25d4bf59491a05ec250b6bc9 /core/divelist.c | |
| parent | 52d8d89f73542eb8ab3577bc55b466e7ca73bfc7 (diff) | |
| download | subsurface-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/divelist.c')
| -rw-r--r-- | core/divelist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/divelist.c b/core/divelist.c index 5eae5e638..451ed70a7 100644 --- a/core/divelist.c +++ b/core/divelist.c @@ -66,7 +66,7 @@ void get_dive_gas(const struct dive *dive, int *o2_p, int *he_p, int *o2max_p) for (i = 0; i < dive->cylinders.nr; i++) { - const cylinder_t *cyl = dive->cylinders.cylinders + i; + const cylinder_t *cyl = get_cylinder(dive, i); int o2 = get_o2(cyl->gasmix); int he = get_he(cyl->gasmix); @@ -349,7 +349,7 @@ static double calculate_airuse(const struct dive *dive) for (i = 0; i < dive->cylinders.nr; i++) { pressure_t start, end; - const cylinder_t *cyl = dive->cylinders.cylinders + i; + const cylinder_t *cyl = get_cylinder(dive, i); start = cyl->start.mbar ? cyl->start : cyl->sample_start; end = cyl->end.mbar ? cyl->end : cyl->sample_end; |