summaryrefslogtreecommitdiff
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-08 15:17:42 +0530
commit17875ecd5c7e182e59a9e15570e0d512aaf31529 (patch)
tree9b047b1c259aa6a0b442239e2f559f9b2084d404
parent2c30c0751f2234e316264fae0f82a23d569cd8f4 (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>
-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 6bbf38b6..41933c7e 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: