coverity

3 files changed, 30 insertions, 15 deletions

diff --git a/src/regex/regex.c b/src/regex/regex.c
index 4c0f28851..d659cb949 100644
--- a/src/regex/regex.c
+++ b/src/regex/regex.c
@@ -513,11 +513,12 @@ GNUNET_REGEX_automaton_traverse (const struct GNUNET_REGEX_Automaton *a,
 {
   unsigned int count;
   struct GNUNET_REGEX_State *s;
-  int marks[a->state_count];
 
   if (NULL == a || 0 == a->state_count)
     return;
 
+  int marks[a->state_count];
+
   for (count = 0, s = a->states_head; NULL != s && count < a->state_count;
        s = s->next, count++)
   {
@@ -1206,6 +1207,13 @@ automaton_create_proofs_simplify (char *R_last_ij, char *R_last_ik,
 static void
 automaton_create_proofs (struct GNUNET_REGEX_Automaton *a)
 {
+  if (NULL == a)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Could not create proofs, automaton was NULL\n");
+    return;
+  }
+
   unsigned int n = a->state_count;
   struct GNUNET_REGEX_State *states[n];
   char *R_last[n][n];
@@ -1217,13 +1225,6 @@ automaton_create_proofs (struct GNUNET_REGEX_Automaton *a)
   unsigned int j;
   unsigned int k;
 
-  if (NULL == a)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Could not create proofs, automaton was NULL\n");
-    return;
-  }
-
   /* create depth-first numbering of the states, initializes 'state' */
   GNUNET_REGEX_automaton_traverse (a, a->start, NULL, NULL, &number_states,
                                    states);
diff --git a/src/regex/test_regex_eval_api.c b/src/regex/test_regex_eval_api.c
index 7538a25d8..35eef6d29 100644
--- a/src/regex/test_regex_eval_api.c
+++ b/src/regex/test_regex_eval_api.c
@@ -71,7 +71,7 @@ test_random (unsigned int rx_length, unsigned int max_str_len,
   regmatch_t matchptr[1];
   char error[200];
   int result;
-  char *canonical_regex;
+  char *canonical_regex = NULL;
 
   /* At least one string is needed for matching */
   GNUNET_assert (str_count > 0);
@@ -96,7 +96,8 @@ test_random (unsigned int rx_length, unsigned int max_str_len,
     if (NULL == dfa)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Constructing DFA failed\n");
-      return -1;
+      GNUNET_free (matching_str);
+      goto error;
     }
 
     eval = GNUNET_REGEX_eval (dfa, matching_str);
@@ -109,7 +110,7 @@ test_random (unsigned int rx_length, unsigned int max_str_len,
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Could not compile regex using regcomp: %s\n", rand_rx);
-      return -1;
+      goto error;
     }
 
     eval_check = regexec (&rx, matching_str, 1, matchptr, 0);
@@ -127,7 +128,7 @@ test_random (unsigned int rx_length, unsigned int max_str_len,
     if (NULL == dfa)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Constructing DFA failed\n");
-      return -1;
+      goto error;
     }
 
     eval_canonical = GNUNET_REGEX_eval (dfa, matching_str);
@@ -138,7 +139,7 @@ test_random (unsigned int rx_length, unsigned int max_str_len,
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Could not compile regex using regcomp: %s\n",
                   canonical_regex);
-      return -1;
+      goto error;
     }
 
     eval_canonical_check = regexec (&rx, matching_str, 1, matchptr, 0);
@@ -169,6 +170,12 @@ test_random (unsigned int rx_length, unsigned int max_str_len,
   GNUNET_free (canonical_regex);
 
   return result;
+
+error:
+  GNUNET_free_non_null (matching_str);
+  GNUNET_free_non_null (rand_rx);
+  GNUNET_free_non_null (canonical_regex);
+  return -1;
 }
 
 /**
diff --git a/src/regex/test_regex_graph_api.c b/src/regex/test_regex_graph_api.c
index 9e8e1fb16..b20a6d07f 100644
--- a/src/regex/test_regex_graph_api.c
+++ b/src/regex/test_regex_graph_api.c
@@ -48,7 +48,7 @@ filecheck (const char *filename)
   if (NULL == fp)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not find graph %s\n", filename);
-    error++;
+    return ++error;
   }
 
   fseek (fp, 0L, SEEK_END);
@@ -62,7 +62,14 @@ filecheck (const char *filename)
   error += fclose (fp);
 
   if (!KEEP_FILES)
-    unlink (filename);
+  {
+    if (0 != unlink (filename))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not remove temp files (%s)\n",
+                  filename);
+    }
+  }
+
 
   return error;
 }