2 files changed, 12 insertions, 5 deletions

diff --git a/src/regex/perf-regex.c b/src/regex/perf-regex.c
index 18c51987d..15ca1690e 100644
--- a/src/regex/perf-regex.c
+++ b/src/regex/perf-regex.c
@@ -51,6 +51,7 @@ main (int argc, char *const *argv)
   char *buffer;
   char *regex;
   unsigned int nr;
+  unsigned int i;
   int compression;
   long size;
   size_t len;
@@ -112,12 +113,16 @@ main (int argc, char *const *argv)
 
   GNUNET_asprintf (&regex, "GNVPN-0001-PAD(%s)(0|1)*", buffer);
   
-//   fprintf (stderr, "Combined regex:\n%s\n", regex);
+  fprintf (stderr, "Combined regex:\n%s\n", regex);
 //   return 0;
 
   compression = atoi (argv[2]);
   dfa = GNUNET_REGEX_construct_dfa (regex, size, compression);
   GNUNET_REGEX_automaton_destroy (dfa);
+  GNUNET_free (buffer);
+  for (i=0;i<nr;i++)
+    GNUNET_free (regexes[i]);
+  GNUNET_array_grow (regexes, nr, 0);
   return 0;
 }
 
diff --git a/src/regex/regex.c b/src/regex/regex.c
index 839b425bf..0a2671fa0 100644
--- a/src/regex/regex.c
+++ b/src/regex/regex.c
@@ -3703,18 +3703,20 @@ GNUNET_REGEX_combine (char * const regexes[])
   unsigned int i;
   char *combined;
   const char *current;
-  struct RegexCombineCtx *ctx;
+  struct RegexCombineCtx ctx;
 
-  ctx = GNUNET_malloc (sizeof (struct RegexCombineCtx));
+  memset (&ctx, 0, sizeof (struct RegexCombineCtx));
   for (i = 0; regexes[i]; i++)
   {
     current = regexes[i];
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Regex %u: %s\n", i, current);
-    regex_add (ctx, current);
+    regex_add (&ctx, current);
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\nCombining...\n");
 
-  combined = regex_combine (ctx);
+  combined = regex_combine (&ctx);
 
   return combined;
 }
+
+/* end of regex.c */