From 33137c62b05006bb2bf3925b1e504a95f356830e Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 27 Oct 2019 07:28:57 -0400 Subject: Cleanup: NULL check pointer before dereferencing Found by Coverity. CID 350081, 350087, 350095 Signed-off-by: Dirk Hohndel --- core/dive.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'core') diff --git a/core/dive.c b/core/dive.c index 20981c48c..d845d8077 100644 --- a/core/dive.c +++ b/core/dive.c @@ -3275,11 +3275,12 @@ int split_dive(const struct dive *dive, struct dive **new1, struct dive **new2) int split_dive_at_time(const struct dive *dive, duration_t time, struct dive **new1, struct dive **new2) { int i = 0; - struct sample *sample = dive->dc.sample; - *new1 = *new2 = NULL; if (!dive) return -1; + + struct sample *sample = dive->dc.sample; + *new1 = *new2 = NULL; while(sample->time.seconds < time.seconds) { ++sample; ++i; @@ -3670,7 +3671,7 @@ static void delete_divecomputer(struct dive *d, int num) struct divecomputer *pdc = &d->dc; for (i = 0; i < num - 1 && pdc; i++) pdc = pdc->next; - if (pdc->next) { + if (pdc && pdc->next) { struct divecomputer *dc = pdc->next; pdc->next = dc->next; free_dc(dc); -- cgit v1.2.3-70-g09d2