diff options
| author | Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | 2013-06-18 21:21:08 +0300 |
|---|---|---|
| committer | Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | 2013-06-19 18:21:36 +0300 |
| commit | 0e9baa429ea2620dbb11f4b3a26eaa46620a9124 (patch) | |
| tree | 4216fa4b364df20d0b10de8023da1bc2cd8aa1d4 /src/modules/module-combine-sink.c | |
| parent | e1e154c7377779377fa1a36655a10effd693f7b5 (diff) | |
| download | pulseaudio-0e9baa429ea2620dbb11f4b3a26eaa46620a9124.tar.gz | |
combine: Fix crash in output freeing
The outputs are removed from the idxset before output_free() is
called. Trying to remove them again in output_free(), and asserting
that it should succeed caused crashing whenever outputs were freed.
This bug was introduced in commit
061878b5a47ed9aa05d12430b039874b63c29a84.
BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=65901
Diffstat (limited to 'src/modules/module-combine-sink.c')
| -rw-r--r-- | src/modules/module-combine-sink.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/modules/module-combine-sink.c b/src/modules/module-combine-sink.c index 7d660f086..faf65c22c 100644 --- a/src/modules/module-combine-sink.c +++ b/src/modules/module-combine-sink.c @@ -923,8 +923,6 @@ static void output_free(struct output *o) { pa_assert(o); output_disable(o); - - pa_assert_se(pa_idxset_remove_by_data(o->userdata->outputs, o, NULL)); update_description(o->userdata); if (o->inq_rtpoll_item_read) |