Merge branch 'master' into next

diff --git a/dccp_recv.c b/dccp_recv.c
index 4d4ac86db31cb28f1d2d1d9f081f13dc8a139dcc..58c969a255335461d0481e8864ec79fb41269dac 100644 (file)
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -158,4 +158,5 @@ void dccp_recv_init(struct receiver *r)
                .short_help = dccp_recv_args_info_help,
                .detailed_help = dccp_recv_args_info_detailed_help
        };
+       dccp_recv_cmdline_parser_free(&dummy);
 }

diff --git a/filter.c b/filter.c
index 99b12217b8cc1e701c428928478a03a00ccd0c74..e6c75556b91e5ecc0c3ca1f005f5471056bdfb7a 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -62,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;
@@ -70,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;
@@ -93,6 +102,7 @@ static int init_filter_chain(void)
        open_filters();
        return 1;
 err:
+       free_filter_confs();
        free(fc->filter_nodes);
        return ret;
 }
@@ -181,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);

diff --git a/ggo/udp_recv.ggo b/ggo/udp_recv.ggo
index f19d319440192bad3a7af5e1ce34212f2b92438a..4c37eace5affa02a9cdb90e1aecbe65a12e9e184 100644 (file)
--- a/ggo/udp_recv.ggo
+++ b/ggo/udp_recv.ggo
@@ -3,7 +3,7 @@ option "host" i
 string default="224.0.1.38"
 optional
 details="
-       The default address resoves to DANTZ.MCAST.NET and activates
+       The default address resolves to DANTZ.MCAST.NET and activates
        multicast.
 "
 

diff --git a/http_recv.c b/http_recv.c
index f644233ba1ed1adb63fe9f21cf675ff319b5531d..13e9ede23d4d3cda0dcea71fbeef9dc0602dbd6f 100644 (file)
--- a/http_recv.c
+++ b/http_recv.c
@@ -204,4 +204,5 @@ void http_recv_init(struct receiver *r)
                .short_help = http_recv_args_info_help,
                .detailed_help = http_recv_args_info_detailed_help
        };
+       http_recv_cmdline_parser_free(&dummy);
 }

diff --git a/udp_recv.c b/udp_recv.c
index 7bbd4b0c575a351055170bab1df3f186769c6783..f9782985d113d390c70300d099546066203f188d 100644 (file)
--- a/udp_recv.c
+++ b/udp_recv.c
@@ -239,4 +239,5 @@ void udp_recv_init(struct receiver *r)
                .short_help = udp_recv_args_info_help,
                .detailed_help = udp_recv_args_info_detailed_help
        };
+       udp_recv_cmdline_parser_free(&dummy);
 }