oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/PipeWire: catch exceptions in ParamChanged()

Browse Source 
Fixes a potential crash bug.
This commit is contained in:
Max Kellermann 2022-07-08 17:21:37 +02:00
parent d2fb229685
commit 9c3cf39fdd
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/output/plugins/PipeWireOutputPlugin.cxx
View File

@ -24,6 +24,7 @@
#include "../Error.hxx" #include "../Error.hxx"
#include "mixer/plugins/PipeWireMixerPlugin.hxx" #include "mixer/plugins/PipeWireMixerPlugin.hxx"
#include "pcm/Silence.hxx" #include "pcm/Silence.hxx"
#include "lib/fmt/ExceptionFormatter.hxx"
#include "system/Error.hxx" #include "system/Error.hxx"
#include "util/BitReverse.hxx" #include "util/BitReverse.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
@ -656,7 +657,14 @@ PipeWireOutput::ParamChanged([[maybe_unused]] uint32_t id,
{ {
if (restore_volume) { if (restore_volume) {
restore_volume = false; restore_volume = false;
try {
::SetVolume(*stream, channels, volume); ::SetVolume(*stream, channels, volume);
} catch (...) {
FmtError(pipewire_output_domain,
FMT_STRING("Failed to restore volume: {}"),
std::current_exception());
}
} }
#if defined(ENABLE_DSD) && defined(SPA_AUDIO_DSD_FLAG_NONE) #if defined(ENABLE_DSD) && defined(SPA_AUDIO_DSD_FLAG_NONE)