FlapJackApps/libdivecomputer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup: correctly handle upper bound of array

Browse Source 
Coverity CID 207684
Coverity CID 207724
Coverity CID 207728

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-01-04 08:50:16 -08:00 committed by Jef Driesen
parent 81f3fdd854
commit bd00ddea17
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/suunto_eonsteel_parser.c
View File

@ -222,7 +222,7 @@ static int fill_in_group_details(suunto_eonsteel_parser_t *eon, struct type_desc
long index; long index;
index = strtol(grp, &end, 10); index = strtol(grp, &end, 10);
if (index < 0 || index > MAXTYPE || end == grp) { if (index < 0 || index >= MAXTYPE || end == grp) {
ERROR(eon->base.context, "Group type descriptor '%s' does not parse", desc->desc); ERROR(eon->base.context, "Group type descriptor '%s' does not parse", desc->desc);
break; break;
} }
@ -349,7 +349,7 @@ static int record_type(suunto_eonsteel_parser_t *eon, unsigned short type, const
} }
} while ((name = next) != NULL); } while ((name = next) != NULL);
if (type > MAXTYPE) { if (type >= MAXTYPE) {
ERROR(eon->base.context, "Type out of range (%04x: '%s' '%s' '%s')", ERROR(eon->base.context, "Type out of range (%04x: '%s' '%s' '%s')",
type, type,
desc.desc ? desc.desc : "", desc.desc ? desc.desc : "",
@ -418,7 +418,7 @@ static int traverse_entry(suunto_eonsteel_parser_t *eon, const unsigned char *p,
end += 4; end += 4;
} }
if (type > MAXTYPE || !eon->type_desc[type].desc) { if (type >= MAXTYPE || !eon->type_desc[type].desc) {
HEXDUMP(eon->base.context, DC_LOGLEVEL_DEBUG, "last", last, 16); HEXDUMP(eon->base.context, DC_LOGLEVEL_DEBUG, "last", last, 16);
HEXDUMP(eon->base.context, DC_LOGLEVEL_DEBUG, "this", begin, 16); HEXDUMP(eon->base.context, DC_LOGLEVEL_DEBUG, "this", begin, 16);
} else { } else {