summaryrefslogtreecommitdiffstats
path: root/src/modules/module-combine.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-01-08 21:51:30 +0100
committerLennart Poettering <lennart@poettering.net>2010-01-08 21:51:30 +0100
commit3eed219a50c943251b41814e779cc37daf47e8f4 (patch)
treee96dbff80bad3d28cb27c233f2115c9b0457a4b6 /src/modules/module-combine.c
parent8d356659e69556fa25d0579a66084f820683e2b8 (diff)
core: make sure we always return a valid memblock in sink_input_pop() callbacks
https://bugzilla.redhat.com/show_bug.cgi?id=553607
Diffstat (limited to 'src/modules/module-combine.c')
-rw-r--r--src/modules/module-combine.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c
index a186c899..62e62679 100644
--- a/src/modules/module-combine.c
+++ b/src/modules/module-combine.c
@@ -890,7 +890,7 @@ static struct output *output_new(struct userdata *u, pa_sink *sink) {
1,
0,
0,
- NULL);
+ &u->sink->silence);
pa_assert_se(pa_idxset_put(u->outputs, o, NULL) == 0);
update_description(u);