From e139b7b15fbffba6cf302ec49a67239663144a5b Mon Sep 17 00:00:00 2001 From: Salvador Cuñat Date: Sun, 19 Apr 2020 07:54:35 +0200 Subject: [smtk-import] add some sanity checks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Under some circustances values stored in this arrays may be NULL or even previously freed. Check them to avoid further crashes. Signed-off-by: Salvador Cuñat --- smtk-import/smartrak.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'smtk-import') diff --git a/smtk-import/smartrak.c b/smtk-import/smartrak.c index 8791a5551..c3e4f562e 100644 --- a/smtk-import/smartrak.c +++ b/smtk-import/smartrak.c @@ -44,7 +44,8 @@ static void smtk_free(char **array, int count) { int n; for (n = 0; n < count; n++) - free(array[n]); + if (array[n]) + free(array[n]); array = NULL; } @@ -727,6 +728,8 @@ static void smtk_parse_relations(MdbHandle *mdb, struct dive *dive, char *dive_i /* Get the text associated with the relations */ for (d_runner = diverel_head; d_runner; d_runner = d_runner->next) { + if (! list[d_runner->idx - 1]) + continue; if (tag) taglist_add_tag(&dive->tag_list, list[d_runner->idx - 1]); else -- cgit v1.2.3-70-g09d2