From ed3a26296dc34913dab7ca21426930cbcb436c84 Mon Sep 17 00:00:00 2001
From: Michael Black W9MDB <mdblack98@yahoo.com>
Date: Sat, 4 Jul 2020 07:17:45 -0500
Subject: [PATCH] Fix cppcheck warnings
---
tests/memcsv.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/tests/memcsv.c b/tests/memcsv.c
index fe14ddd1d..ce53b7acf 100644
--- a/tests/memcsv.c
+++ b/tests/memcsv.c
@@ -290,7 +290,7 @@ static char *mystrtok(char *s, char delim)
{
}
- if (str[ pos + 1 ] == '\0')
+ if (str && str[ pos + 1 ] == '\0')
{
return NULL;
}
@@ -1038,6 +1038,11 @@ int find_on_list(char **list, char *what)
return -1;
}
+ if (!list[i])
+ {
+ return -1;
+ }
+
while (list[i] != NULL)
{
if (strcmp(list[i], what) == 0)
@@ -1049,13 +1054,5 @@ int find_on_list(char **list, char *what)
i++;
}
}
-
- if (!list[i])
- {
- return -1;
- }
- else
- {
- return i;
- }
+ return i;
}