Attachment 58920 Details for Bug 44397 – Preliminary patch

[patch] Preliminary patch

0001-sink-Prevent-filter-sink-cycles.patch (text/plain), 1.65 KB, created by David Henningsson on 2012-03-23 05:10:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Henningsson

Created: 2012-03-23 05:10:20 UTC

Size: 1.65 KB

patch

obsolete

>From c89b41abebddcb1775b75a37739c6d8d6d681b08 Mon Sep 17 00:00:00 2001
>From: David Henningsson <david.henningsson@canonical.com>
>Date: Fri, 23 Mar 2012 13:06:27 +0100
>Subject: [PATCH] sink: Prevent filter sink cycles
>
>BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=44397
>Signed-off-by: David Henningsson <david.henningsson@canonical.com>
>---
> src/pulsecore/sink-input.c |   15 +++++++++++++++
> 1 files changed, 15 insertions(+), 0 deletions(-)
>
>diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c
>index b8412bd..a8aeda6 100644
>--- a/src/pulsecore/sink-input.c
>+++ b/src/pulsecore/sink-input.c
>@@ -1383,6 +1383,15 @@ pa_bool_t pa_sink_input_may_move(pa_sink_input *i) {
>     return TRUE;
> }
> 
>+static pa_bool_t find_filter_sink_input(pa_sink_input *target, pa_sink *s) {
>+    while (s && s->input_to_master) {
>+        if (s->input_to_master == target)
>+            return TRUE;
>+        s = s->input_to_master->origin_sink;
>+    }
>+    return FALSE;
>+}
>+
> /* Called from main context */
> pa_bool_t pa_sink_input_may_move_to(pa_sink_input *i, pa_sink *dest) {
>     pa_sink_input_assert_ref(i);
>@@ -1396,6 +1405,12 @@ pa_bool_t pa_sink_input_may_move_to(pa_sink_input *i, pa_sink *dest) {
>     if (!pa_sink_input_may_move(i))
>         return FALSE;
> 
>+    /* Make sure we're not creating a filter sink cycle */
>+    if (find_filter_sink_input(i, dest)) {
>+        pa_log_debug("Can't connect input to %s, as that would create a cycle.", dest->name);
>+        return FALSE;
>+    }
>+
>     if (pa_idxset_size(dest->inputs) >= PA_MAX_INPUTS_PER_SINK) {
>         pa_log_warn("Failed to move sink input: too many inputs per sink.");
>         return FALSE;
>-- 
>1.7.9.1
>

Actions: View | Splinter Review

Attachments on bug 44397: 55057 | 55942 | 55943 | 58920 | 58966 | 58967 | 58968 | 59067 | 59079 | 59098 | 59107

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.