mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-19 14:25:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: avoid dereferencing NULL

Browse source 
We should call this function with two well defined dive_or_trip structures
which means that exactly one of the two values is set in each argument. But
in order to not have bugs elsewhere leed to crashes here, be more tolerant
of malformed argumnts.

Fixes CID 350100

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2019-10-27 16:29:22 -04:00
parent 130534aedf
commit fd9e1d6a8a
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/divelist.c
View file

@ -1478,6 +1478,18 @@ static int comp_dive_to_trip(struct dive *a, struct dive_trip *b)
static int comp_dive_or_trip(struct dive_or_trip a, struct dive_or_trip b)
{
/* we should only be called with both a and b having exactly one of
* dive or trip not NULL. But in an abundance of caution, make sure
* we still give a consistent answer even when called with invalid
* arguments, as otherwise we might be hunting down crashes at a later
* time...
*/
if (!a.dive && !a.trip && !b.dive && !b.trip)
return 0;
if (!a.dive && !a.trip)
return -1;
if (!b.dive && !b.trip)
return 1;
if (a.dive && b.dive)
return comp_dives(a.dive, b.dive);
if (a.trip && b.trip)