From de19bdd34e54c6a4fe8791d28ce0733343381488 Mon Sep 17 00:00:00 2001 From: Scott Reeves Date: Fri, 21 Aug 2009 23:59:39 +0200 Subject: daemon: fix leak of script_commands --- src/daemon/cmdline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/daemon/cmdline.c') diff --git a/src/daemon/cmdline.c b/src/daemon/cmdline.c index ecb38486..3ebc9270 100644 --- a/src/daemon/cmdline.c +++ b/src/daemon/cmdline.c @@ -385,7 +385,7 @@ int pa_cmdline_parse(pa_daemon_conf *conf, int argc, char *const argv [], int *d pa_xfree(conf->script_commands); conf->script_commands = pa_strbuf_tostring_free(buf); - if (!conf->script_commands) { + if (conf->script_commands) { pa_xfree(conf->script_commands); conf->script_commands = NULL; } -- cgit From aa5429805f88bcade639e5e8667b79a07ec104b6 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 22 Aug 2009 03:16:47 +0200 Subject: daemon: don't free script_commands twice --- src/daemon/cmdline.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/daemon/cmdline.c') diff --git a/src/daemon/cmdline.c b/src/daemon/cmdline.c index 3ebc9270..f6cdcdc8 100644 --- a/src/daemon/cmdline.c +++ b/src/daemon/cmdline.c @@ -385,11 +385,6 @@ int pa_cmdline_parse(pa_daemon_conf *conf, int argc, char *const argv [], int *d pa_xfree(conf->script_commands); conf->script_commands = pa_strbuf_tostring_free(buf); - if (conf->script_commands) { - pa_xfree(conf->script_commands); - conf->script_commands = NULL; - } - *d = optind; return 0; -- cgit