X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter_chain.c;h=3a5b85dde69978e749e87dafc535507d79509ce6;hp=70c3d39554a8b2414b37a515a3977d428b6173b2;hb=a8fd00dc4494bbcaecdf2302005c05a2d104b380;hpb=6573529d8d28ab8e49e1b2f83cc7e8378c5f4605

diff --git a/filter_chain.c b/filter_chain.c
index 70c3d395..3a5b85dd 100644
--- a/filter_chain.c
+++ b/filter_chain.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -100,6 +100,9 @@ static void call_callbacks(struct filter_node *fn, char *inbuf, size_t inlen,
 /**
  * call the convert function of each filter
  *
+ * \param s unused
+ * \param t the task containing the filter chain
+ *
  * This is the core function of the filter subsystem. It loops over the list of
  * filter nodes determined by \a t and calls the filter's convert function if
  * there is input available for the filter node in question. If the convert
@@ -130,21 +133,22 @@ again:
 	conv = 0;
 	list_for_each_entry(fn, &fc->filters, node) {
 		if (*loaded && fn->loaded < fn->bufsize) {
-			size_t old_fn_loaded = fn->loaded;
+			size_t size, old_fn_loaded = fn->loaded;
 //			PARA_DEBUG_LOG("fc %p loaded: %zd, calling %s convert\n",
 //				fc, *loaded, fn->filter->name);
 			t->ret = fn->filter->convert(ib, *loaded, fn);
 			if (t->ret < 0)
 				goto err_out;
-			call_callbacks(fn, ib, t->ret, fn->buf + old_fn_loaded,
+			size = t->ret;
+			call_callbacks(fn, ib, size, fn->buf + old_fn_loaded,
 				fn->loaded - old_fn_loaded);
-			*loaded -= t->ret;
-			conv += t->ret;
-			if (*loaded && t->ret) {
+			*loaded -= size;
+			conv += size;
+			if (*loaded && size) {
 //				PARA_DEBUG_LOG("moving %zd bytes in input "
 //					"buffer for %s filter\n",
 //					*loaded,  fn->filter->name);
-				memmove(ib, ib + t->ret, *loaded);
+				memmove(ib, ib + size, *loaded);
 			}
 		}
 		ib = fn->buf;
@@ -219,6 +223,8 @@ static int parse_filter_args(int filter_num, char *options, void **conf)
 	argv[0] = para_strdup(f->name);
 	argc += 1;
 	*conf = f->parse_config(argc, argv);
+	free(argv[0]);
+	free(argv);
 	return *conf? filter_num : -E_BAD_FILTER_OPTIONS;
 }