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/parse-xml.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/parse-xml.c')
| -rw-r--r-- | core/parse-xml.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/parse-xml.c b/core/parse-xml.c index 0f297bf9a..bca0269a3 100644 --- a/core/parse-xml.c +++ b/core/parse-xml.c @@ -704,7 +704,7 @@ void add_gas_switch_event(struct dive *dive, struct divecomputer *dc, int second return; } /* The gas switch event format is insane for historical reasons */ - struct gasmix mix = dive->cylinders.cylinders[idx].gasmix; + struct gasmix mix = get_cylinder(dive, idx)->gasmix; int o2 = get_o2(mix); int he = get_he(mix); struct event *ev; @@ -1242,7 +1242,7 @@ static void gps_picture_location(char *buffer, struct picture *pic) static void try_to_fill_dive(struct dive *dive, const char *name, char *buf, struct parser_state *state) { char *hash = NULL; - cylinder_t *cyl = dive->cylinders.nr > 0 ? &dive->cylinders.cylinders[dive->cylinders.nr - 1] : NULL; + cylinder_t *cyl = dive->cylinders.nr > 0 ? get_cylinder(dive, dive->cylinders.nr - 1) : NULL; pressure_t p; start_match("dive", name, buf); @@ -1904,7 +1904,7 @@ int parse_dlf_buffer(unsigned char *buffer, size_t size, struct dive_table *tabl found = false; for (i = 0; i < state.cur_dive->cylinders.nr; ++i) { - const cylinder_t *cyl = &state.cur_dive->cylinders.cylinders[i]; + const cylinder_t *cyl = get_cylinder(state.cur_dive, i); if (cyl->gasmix.o2.permille == ptr[6] * 10 && cyl->gasmix.he.permille == ptr[7] * 10) { found = true; break; |