[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.19-628-g8df8cfa

[Colin Guthrie]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  027786c6de08abcfb0e8702e59810e1f00977d68 (commit)

- Log -----------------------------------------------------------------
8df8cfa echo-cancel: Fix source may_move_to function
596e179 rescue-streams: Fix segfault in some conditions
-----------------------------------------------------------------------

Summary of changes:
 src/modules/echo-cancel/module-echo-cancel.c |    2 +-
 src/modules/module-rescue-streams.c          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------

commit 596e1792e0b8af3b600db4b82ad9967815642803
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Thu Dec 2 16:30:59 2010 +0530

    rescue-streams: Fix segfault in some conditions
    
    There is a call to this function where 'skip' variable is NULL. Looks
    like this code doesn't get hit very often, probably because a suitable
    default sink can be found to move the stream to. However, if we can't
    move to the default sink and skip is NULL, there will be a segfault.

diff --git a/src/modules/module-rescue-streams.c b/src/modules/module-rescue-streams.c
index 722d84b..2fcd21f 100644
--- a/src/modules/module-rescue-streams.c
+++ b/src/modules/module-rescue-streams.c
@@ -159,7 +159,7 @@ static pa_source* find_evacuation_source(pa_core *c, pa_source_output *o, pa_sou
         if (target == skip)
             continue;
 
-        if (!target->monitor_of != !skip->monitor_of)
+        if (skip && !target->monitor_of != !skip->monitor_of)
             continue;
 
         if (!PA_SOURCE_IS_LINKED(pa_source_get_state(target)))

commit 8df8cfa0c2f29b5b0ff49bb579c75214cac774fd
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Thu Dec 2 16:34:03 2010 +0530

    echo-cancel: Fix source may_move_to function
    
    This is required to make sure that the source output between
    module-echo-cancel and ALSA can't get plugged to the virtual source or
    monitor of the virtual sink that we expose. This could be triggered by
    changing the profile of the underlying ALSA device.

diff --git a/src/modules/echo-cancel/module-echo-cancel.c b/src/modules/echo-cancel/module-echo-cancel.c
index b6c82a5..611ebb7 100644
--- a/src/modules/echo-cancel/module-echo-cancel.c
+++ b/src/modules/echo-cancel/module-echo-cancel.c
@@ -1212,7 +1212,7 @@ static pa_bool_t source_output_may_move_to_cb(pa_source_output *o, pa_source *de
     pa_assert_ctl_context();
     pa_assert_se(u = o->userdata);
 
-    return TRUE;
+    return (u->source != dest) && (u->sink != dest->monitor_of);
 }
 
 /* Called from main context */

-- 
hooks/post-receive
PulseAudio Sound Server