From e2ae5f952575f8cc93d14e3e93a24792e1904231 Mon Sep 17 00:00:00 2001 From: Jef Driesen Date: Tue, 22 Oct 2019 20:58:06 +0200 Subject: [PATCH 1/2] Fix a buffer overflow There are 8 opening/closing records instead of 7. --- src/shearwater_predator_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shearwater_predator_parser.c b/src/shearwater_predator_parser.c index 02b34da..e2f88fa 100644 --- a/src/shearwater_predator_parser.c +++ b/src/shearwater_predator_parser.c @@ -69,7 +69,7 @@ #define NGASMIXES 10 #define NTANKS 2 -#define NRECORDS 7 +#define NRECORDS 8 #define PREDATOR 2 #define PETREL 3 From e215d10296f8ebef42c011883f28a8b992d00569 Mon Sep 17 00:00:00 2001 From: Jef Driesen Date: Tue, 22 Oct 2019 21:29:43 +0200 Subject: [PATCH 2/2] Add support for the Oceanic Geo 4.0 --- src/descriptor.c | 1 + src/oceanic_atom2.c | 2 ++ src/oceanic_atom2_parser.c | 15 ++++++++++----- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/descriptor.c b/src/descriptor.c index 65105f3..824e496 100644 --- a/src/descriptor.c +++ b/src/descriptor.c @@ -241,6 +241,7 @@ static const dc_descriptor_t g_descriptors[] = { {"Aqualung", "i100", DC_FAMILY_OCEANIC_ATOM2, 0x464E, DC_TRANSPORT_SERIAL, NULL}, {"Aqualung", "i770R", DC_FAMILY_OCEANIC_ATOM2, 0x4651, DC_TRANSPORT_SERIAL, NULL}, {"Aqualung", "i550C", DC_FAMILY_OCEANIC_ATOM2, 0x4652, DC_TRANSPORT_SERIAL, NULL}, + {"Oceanic", "Geo 4.0", DC_FAMILY_OCEANIC_ATOM2, 0x4653, DC_TRANSPORT_SERIAL, NULL}, /* Mares Nemo */ {"Mares", "Nemo", DC_FAMILY_MARES_NEMO, 0, DC_TRANSPORT_SERIAL, NULL}, {"Mares", "Nemo Steel", DC_FAMILY_MARES_NEMO, 0, DC_TRANSPORT_SERIAL, NULL}, diff --git a/src/oceanic_atom2.c b/src/oceanic_atom2.c index 88d8c54..b93de28 100644 --- a/src/oceanic_atom2.c +++ b/src/oceanic_atom2.c @@ -36,6 +36,7 @@ #define VTX 0x4557 #define I750TC 0x455A #define I770R 0x4651 +#define GEO40 0x4653 #define MAXRETRIES 2 #define MAXDELAY 16 @@ -137,6 +138,7 @@ static const oceanic_common_version_t oceanic_default_version[] = { {"ELITET31 \0\0 512K"}, {"DATAMASK \0\0 512K"}, {"COMPMASK \0\0 512K"}, + {"OCEGEO40 \0\0 512K"}, }; static const oceanic_common_version_t sherwood_wisdom_version[] = { diff --git a/src/oceanic_atom2_parser.c b/src/oceanic_atom2_parser.c index 7a517d0..892ee1f 100644 --- a/src/oceanic_atom2_parser.c +++ b/src/oceanic_atom2_parser.c @@ -92,6 +92,7 @@ #define I100 0x464E #define I770R 0x4651 #define I550C 0x4652 +#define GEO40 0x4653 #define NORMAL 0 #define GAUGE 1 @@ -164,7 +165,7 @@ oceanic_atom2_parser_create (dc_parser_t **out, dc_context_t *context, unsigned model == INSIGHT2 || model == ZEN || model == I300 || model == I550 || model == I200 || model == I200C || - model == I300C) { + model == I300C || model == GEO40) { parser->headersize -= PAGESIZE; } else if (model == VT4 || model == VT41) { parser->headersize += PAGESIZE; @@ -286,6 +287,7 @@ oceanic_atom2_parser_get_datetime (dc_parser_t *abstract, dc_datetime_t *datetim case I200C: case I100: case I300C: + case GEO40: datetime->year = ((p[3] & 0xE0) >> 1) + (p[4] & 0x0F) + 2000; datetime->month = (p[4] & 0xF0) >> 4; datetime->day = p[3] & 0x1F; @@ -722,7 +724,7 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_ parser->model == MANTA || parser->model == I300 || parser->model == I200 || parser->model == I100 || parser->model == I300C || parser->model == TALIS || - parser->model == I200C) { + parser->model == I200C || parser->model == GEO40) { have_pressure = 0; } @@ -880,7 +882,8 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_ parser->model == OCI || parser->model == A300 || parser->model == I450T || parser->model == I300 || parser->model == I200 || parser->model == I100 || - parser->model == I300C || parser->model == I200C) { + parser->model == I300C || parser->model == I200C || + parser->model == GEO40) { temperature = data[offset + 3]; } else if (parser->model == OCS || parser->model == TX1) { temperature = data[offset + 1]; @@ -952,7 +955,8 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_ parser->model == OCI || parser->model == A300 || parser->model == I450T || parser->model == I300 || parser->model == I200 || parser->model == I100 || - parser->model == I300C || parser->model == I200C) + parser->model == I300C || parser->model == I200C || + parser->model == GEO40) depth = (data[offset + 4] + (data[offset + 5] << 8)) & 0x0FFF; else if (parser->model == ATOM1) depth = data[offset + 3] * 16; @@ -1005,7 +1009,8 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_ parser->model == OC1A || parser->model == OC1B || parser->model == OC1C || parser->model == OCI || parser->model == I100 || parser->model == I300C || - parser->model == I450T || parser->model == I200C) { + parser->model == I450T || parser->model == I200C || + parser->model == GEO40) { decostop = (data[offset + 7] & 0xF0) >> 4; decotime = array_uint16_le(data + offset + 6) & 0x0FFF; have_deco = 1;