add completion callback for overlay topology configure functions

[oweals/gnunet.git] / src / regex / regex_test_lib.c

diff --git a/src/regex/regex_test_lib.c b/src/regex/regex_test_lib.c
index 9863d6f4f2de2ee7d38db75d81dbb53cbf5877a6..7a11fe05ece16ac560a39558392736c95f4dbf7a 100644 (file)
--- a/src/regex/regex_test_lib.c
+++ b/src/regex/regex_test_lib.c
@@ -71,7 +71,10 @@ regex_combine (struct RegexCombineCtx *ctx)
   }
   len = strlen (regex);
   if (1 == len)
+  {
+    GNUNET_free (regex);
     return GNUNET_strdup ("");
+  }
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "pre-partial: %s\n", regex);
   if ('|' == regex[len - 1])
@@ -221,6 +224,7 @@ GNUNET_REGEX_read_from_file (const char *filename)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Can't get size of file %s\n", filename);
+    GNUNET_DISK_file_close (f);
     return NULL;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -260,7 +264,9 @@ GNUNET_REGEX_read_from_file (const char *filename)
     GNUNET_array_grow (regexes, nr, nr + 1);
     regexes[nr - 2] = regex;
     regexes[nr - 1] = NULL;
+    regex = NULL;
   } while (offset < size);
+  GNUNET_free_non_null (regex);
   GNUNET_free (buffer);
 
   return regexes;