[pulseaudio-commits] 2 commits - src/modules src/pulsecore

[Arun Raghavan]

 src/modules/jack/module-jackdbus-detect.c |    2 +-
 src/pulsecore/source-output.c             |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 60811ec15d66d0972b0cceb18a0ce03f6fdb160e
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Wed Oct 5 11:15:53 2011 +0200

    source-output: Do not use unset channel map in pa_source_output_new
    
    This problem was found when tracing down a crash coming from the
    esound protocol, which does not set a channel map.
    
    BugLink: http://bugs.launchpad.net/bugs/864071
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>
    
    N.B.: As Colin notes, this is because commit 117c7145 was incomplete
    ("format: Fix channel map handling")

diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c
index ea0e760..f6ad009 100644
--- a/src/pulsecore/source-output.c
+++ b/src/pulsecore/source-output.c
@@ -243,7 +243,8 @@ int pa_source_output_new(
          * to using the sample spec and channel map after all decisions w.r.t.
          * routing are complete. */
         pa_idxset *tmp = pa_idxset_new(NULL, NULL);
-        pa_format_info *f = pa_format_info_from_sample_spec(&data->sample_spec, &data->channel_map);
+        pa_format_info *f = pa_format_info_from_sample_spec(&data->sample_spec,
+                data->channel_map_is_set ? &data->channel_map : NULL);
         pa_idxset_put(tmp, f, NULL);
         pa_source_output_new_data_set_formats(data, tmp);
     }

commit 58585db8084675b6e1999b7ad5b0d89d98f71db8
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Wed Oct 5 10:28:50 2011 +0200

    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 at canonical.com>

diff --git a/src/modules/jack/module-jackdbus-detect.c b/src/modules/jack/module-jackdbus-detect.c
index 6bbf38b..41933c7 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: