Skip to content

M
mpd
Commit a9acc9c9 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

decoder/Thread: catch C++ exceptions from the decoder plugin

parent 30801079
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
src/decoder/DecoderThread.cxx
View file @ a9acc9c9
...@@ -439,7 +439,7 @@ decoder_run_song(DecoderControl &dc, ...@@ -439,7 +439,7 @@ decoder_run_song(DecoderControl &dc,
*/ */
static void static void
decoder_run(DecoderControl &dc) decoder_run(DecoderControl &dc)
{ try {
dc.ClearError(); dc.ClearError();
assert(dc.song != nullptr); assert(dc.song != nullptr);
...@@ -463,7 +463,10 @@ decoder_run(DecoderControl &dc) ...@@ -463,7 +463,10 @@ decoder_run(DecoderControl &dc)
} }
decoder_run_song(dc, song, uri_utf8, path_fs); decoder_run_song(dc, song, uri_utf8, path_fs);
} catch (...) {
dc.state = DecoderState::ERROR;
dc.error = std::current_exception();
dc.client_cond.signal();
} }
static void static void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment