module-jackdbus-detect: Avoid double-free of modargs
authorDavid Henningsson <david.henningsson@canonical.com>
Wed, 5 Oct 2011 08:28:50 +0000 (10:28 +0200)
committerArun Raghavan <arun.raghavan@collabora.co.uk>
Wed, 5 Oct 2011 15:20:03 +0000 (20:50 +0530)
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>
src/modules/jack/module-jackdbus-detect.c

index 6bbf38b..41933c7 100644 (file)
@@ -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: