From e86c756aaa4d3c5020deb46dc570df41764e5524 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Fri, 8 Jan 2010 20:06:05 +0100 Subject: [PATCH] amp filter fixes. - Avoid double free. - Print correct amplification value in log message. --- amp_filter.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/amp_filter.c b/amp_filter.c index e91791bf..690080bd 100644 --- a/amp_filter.c +++ b/amp_filter.c @@ -75,8 +75,6 @@ static int amp_parse_config(int argc, char **argv, void **config) ret = -ERRNO_TO_PARA_ERROR(EINVAL); if (amp_conf->amp_arg < 0) goto err; - PARA_NOTICE_LOG("amplification: %u (scaling factor: %1.2f)\n", - amp_conf->amp_arg, amp_conf->amp_arg / 64.0 + 1.0); *config = amp_conf; return 1; err: @@ -97,6 +95,8 @@ static void amp_open(struct filter_node *fn) pad->amp = pad->conf->amp_arg; fn->bufsize = AMP_CHUNK_SIZE; fn->buf = para_malloc(fn->bufsize); + PARA_NOTICE_LOG("amplification: %u (scaling factor: %1.2f)\n", + pad->amp, pad->amp / 64.0 + 1.0); } static void amp_post_select(__a_unused struct sched *s, struct task *t) @@ -112,7 +112,6 @@ static void amp_post_select(__a_unused struct sched *s, struct task *t) if (pad->amp == 0) { /* no amplification */ t->error = -E_AMP_ZERO_AMP; btr_splice_out_node(btrn); - amp_close(fn); return; } next_buffer: -- 2.39.5