[GNUnet-SVN] r25491 - gnunet/src/regex

[gnunet]

Author: grothoff
Date: 2012-12-15 01:00:36 +0100 (Sat, 15 Dec 2012)
New Revision: 25491

Modified:
   gnunet/src/regex/perf-regex.c
   gnunet/src/regex/regex.c
Log:
-fixing some leaks

Modified: gnunet/src/regex/perf-regex.c
===================================================================
--- gnunet/src/regex/perf-regex.c       2012-12-14 23:21:56 UTC (rev 25490)
+++ gnunet/src/regex/perf-regex.c       2012-12-15 00:00:36 UTC (rev 25491)
@@ -51,6 +51,7 @@
   char *buffer;
   char *regex;
   unsigned int nr;
+  unsigned int i;
   int compression;
   long size;
   size_t len;
@@ -112,12 +113,16 @@
 
   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;
 }
 

Modified: gnunet/src/regex/regex.c
===================================================================
--- gnunet/src/regex/regex.c    2012-12-14 23:21:56 UTC (rev 25490)
+++ gnunet/src/regex/regex.c    2012-12-15 00:00:36 UTC (rev 25491)
@@ -3703,18 +3703,20 @@
   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 */