X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter_chain.c;h=3a5b85dde69978e749e87dafc535507d79509ce6;hp=8a41beda94acc29f3f9650d6d0afee7d265f6095;hb=df3c03e72911edb31e7f1e32ebe29dad063e3b70;hpb=c79899fe6a1e8eb3086749f46c599d9790d99921

diff --git a/filter_chain.c b/filter_chain.c
index 8a41beda..3a5b85dd 100644
--- a/filter_chain.c
+++ b/filter_chain.c
@@ -133,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;
@@ -222,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;
 }