diff options
author | Igor V. Kovalenko <igor.v.kovalenko@gmail.com> | 2020-10-19 08:29:43 +0300 |
---|---|---|
committer | Tanu Kaskinen <tanuk@iki.fi> | 2020-10-20 17:31:29 +0300 |
commit | 44c531762400b561304d35e64f1997e9e06ec1fb (patch) | |
tree | 4c8a3ffd89f8c39a0638288988772fb04e815028 | |
parent | 7f4d7fcf5f6407913e50604c6195d0d5356195b1 (diff) | |
download | pulseaudio-44c531762400b561304d35e64f1997e9e06ec1fb.tar.gz |
device-port: fire port available changed hook after streams are moved
If port becomes unavailable then PA_CORE_HOOK_PORT_AVAILABLE_CHANGED
callbacks may eventually destroy related source or sink object. Call
this hook after stream is moved to prevent crash reading from freed
memory.
Fixes: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/issues/1008
-rw-r--r-- | src/pulsecore/device-port.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/pulsecore/device-port.c b/src/pulsecore/device-port.c index 8263c9e9b..4f9235e51 100644 --- a/src/pulsecore/device-port.c +++ b/src/pulsecore/device-port.c @@ -119,8 +119,6 @@ void pa_device_port_set_available(pa_device_port *p, pa_available_t status) { if (source) pa_subscription_post(p->core, PA_SUBSCRIPTION_EVENT_SOURCE|PA_SUBSCRIPTION_EVENT_CHANGE, source->index); - pa_hook_fire(&p->core->hooks[PA_CORE_HOOK_PORT_AVAILABLE_CHANGED], p); - /* A sink or source whose active port is unavailable can't be the * default sink/source, so port availability changes may affect the * default sink/source choice. */ @@ -146,6 +144,11 @@ void pa_device_port_set_available(pa_device_port *p, pa_available_t status) { pa_core_move_streams_to_newly_available_preferred_source(p->core, source); } } + + /* This may cause the sink and source pointers to become invalid, if + * the availability change causes the card profile to get switched. If + * you add code after this line, remember to take that into account. */ + pa_hook_fire(&p->core->hooks[PA_CORE_HOOK_PORT_AVAILABLE_CHANGED], p); } } |