Attachment 137188 Details for Bug 104958 – Patch ignore monitor sources

[patch] Patch ignore monitor sources

patch.txt (text/plain), 1.67 KB, created by Georg Chini on 2018-02-06 14:31:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Georg Chini

Created: 2018-02-06 14:31:00 UTC

Size: 1.67 KB

patch

obsolete

>From f7194749d3b767c3b88f3dd5740db24b77100af0 Mon Sep 17 00:00:00 2001
>From: Georg Chini <georg@chini.tk>
>Date: Tue, 6 Feb 2018 15:08:13 +0100
>Subject: [PATCH] filter-apply: Ignore monitor source of filter in
> find_paired_master()
>
>When module-filter-apply tries to find a matching source-output for
>a given sink-input and a stream with the same role exists on the
>monitor source of the filter, module-filter apply falsely assumes
>that the source belongs to another instance of the filter and tries
>to access source->output_from_master->source, which leads to a
>segmentation fault.
>
>This patch fixes the issue by ignoring the stream if the source is
>the monitor source of the filter.
>---
> src/modules/module-filter-apply.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
>diff --git a/src/modules/module-filter-apply.c b/src/modules/module-filter-apply.c
>index 783d85ed..163d52a2 100644
>--- a/src/modules/module-filter-apply.c
>+++ b/src/modules/module-filter-apply.c
>@@ -259,6 +259,12 @@ static bool find_paired_master(struct userdata *u, struct filter *filter, pa_obj
> 
>                 if (pa_streq(g, group)) {
>                     if (pa_streq(module_name, so->source->module->name)) {
>+                        /* Make sure we are not routing to the monitor source
>+                         * of the same filter */
>+                        if (so->source->monitor_of) {
>+                            pa_xfree(g);
>+                            continue;
>+                        }
>                         /* Make sure we're not routing to another instance of
>                          * the same filter. */
>                         filter->source_master = so->source->output_from_master->source;
>-- 
>2.14.1
>

Actions: View | Splinter Review

Attachments on bug 104958: 137179 | 137182 | 137188

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.