summaryrefslogtreecommitdiff
path: root/src/modules/jack
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2011-10-05 10:28:50 +0200
committerArun Raghavan <arun.raghavan@collabora.co.uk>2011-10-05 20:50:03 +0530
commit58585db8084675b6e1999b7ad5b0d89d98f71db8 (patch)
tree15c17f2f02bdb24ea79ddde10c112a0cd9840de8 /src/modules/jack
parent42d056593de4bd94bf706c0bd62d05d2aaff77bf (diff)
module-jackdbus-detect: Avoid double-free of modargs
If module-jackdbus-detect failed in the later part of initialization, the ma variable was freed twice. BugLink: http://bugs.launchpad.net/bugs/867444 Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Diffstat (limited to 'src/modules/jack')
-rw-r--r--src/modules/jack/module-jackdbus-detect.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/jack/module-jackdbus-detect.c b/src/modules/jack/module-jackdbus-detect.c
index 6bbf38b6f..41933c7e0 100644
--- a/src/modules/jack/module-jackdbus-detect.c
+++ b/src/modules/jack/module-jackdbus-detect.c
@@ -231,7 +231,6 @@ int pa__init(pa_module *m) {
pa_log("Failed to parse connect= argument.");
goto fail;
}
- pa_modargs_free(ma);
if (!(connection = pa_dbus_bus_get(m->core, DBUS_BUS_SESSION, &error)) || dbus_error_is_set(&error)) {
@@ -259,6 +258,7 @@ int pa__init(pa_module *m) {
check_service_started(u);
+ pa_modargs_free(ma);
return 0;
fail: