X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=e6c75556b91e5ecc0c3ca1f005f5471056bdfb7a;hp=17b7f2fdd938678431e5a294071602807ebdd3e2;hb=0f7851078e5eb89565f9b3194ee100ac20bbb7f1;hpb=b7f19d039c4aa46faa4e9b8e889520fd72df272a

diff --git a/filter.c b/filter.c
index 17b7f2fd..e6c75556 100644
--- a/filter.c
+++ b/filter.c
@@ -6,8 +6,9 @@
 
 /** \file filter.c The stand-alone filter program. */
 
-#include "para.h"
+#include <regex.h>
 
+#include "para.h"
 #include "filter.cmdline.h"
 #include "list.h"
 #include "sched.h"
@@ -61,6 +62,15 @@ static void open_filters(void)
 	}
 }
 
+static void free_filter_confs(void)
+{
+	int i;
+	struct filter_node *fn;
+
+	FOR_EACH_FILTER_NODE(fn, fc, i)
+		free(fn->conf);
+}
+
 static int init_filter_chain(void)
 {
 	int i, ret;
@@ -69,7 +79,7 @@ static int init_filter_chain(void)
 	if (!conf.filter_given)
 		return -E_NO_FILTERS;
 	fc->num_filters = conf.filter_given;
-	fc->filter_nodes = para_malloc(fc->num_filters * sizeof(struct filter_node));
+	fc->filter_nodes = para_calloc(fc->num_filters * sizeof(struct filter_node));
 	fc->inbufp = &sit->buf;
 	fc->in_loaded = &sit->loaded;
 	fc->input_error = &sit->task.error;
@@ -92,6 +102,7 @@ static int init_filter_chain(void)
 	open_filters();
 	return 1;
 err:
+	free_filter_confs();
 	free(fc->filter_nodes);
 	return ret;
 }
@@ -180,6 +191,7 @@ int main(int argc, char *argv[])
 	s.default_timeout.tv_sec = 1;
 	s.default_timeout.tv_usec = 0;
 	ret = schedule(&s);
+	free_filter_confs();
 	close_filters(fc);
 out:
 	free(sit->buf);