1
From 58585db8084675b6e1999b7ad5b0d89d98f71db8 Mon Sep 17 00:00:00 2001
2
From: David Henningsson <david.henningsson@canonical.com>
3
Date: Wed, 5 Oct 2011 10:28:50 +0200
4
Subject: [PATCH] module-jackdbus-detect: Avoid double-free of modargs
6
If module-jackdbus-detect failed in the later part of initialization,
7
the ma variable was freed twice.
9
BugLink: http://bugs.launchpad.net/bugs/867444
10
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
12
src/modules/jack/module-jackdbus-detect.c | 2 +-
13
1 files changed, 1 insertions(+), 1 deletions(-)
15
diff --git a/src/modules/jack/module-jackdbus-detect.c b/src/modules/jack/module-jackdbus-detect.c
16
index 6bbf38b..41933c7 100644
17
--- a/src/modules/jack/module-jackdbus-detect.c
18
+++ b/src/modules/jack/module-jackdbus-detect.c
19
@@ -231,7 +231,6 @@ int pa__init(pa_module *m) {
20
pa_log("Failed to parse connect= argument.");
23
- pa_modargs_free(ma);
25
if (!(connection = pa_dbus_bus_get(m->core, DBUS_BUS_SESSION, &error)) || dbus_error_is_set(&error)) {
27
@@ -259,6 +258,7 @@ int pa__init(pa_module *m) {
29
check_service_started(u);
31
+ pa_modargs_free(ma);