decoder/Thread: clear the command after catching an exception

If an early exception gets caught (e.g. from AllocatedPath::FromUTF8Throw()) before DecoderControl::CommandFinishedLocked() is called, the decoder thread would go in an endless loop, because DecoderCommand::START is still set. Closes #118

decoder/Thread: clear the command after catching an exception
fa67c254 · Max Kellermann · ea80587d · fa67c254 · fa67c254
Commit fa67c254 authored Sep 27, 2017 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

NEWS NEWS +1 -0

DecoderThread.cxx src/decoder/DecoderThread.cxx +1 -0

No files found.
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ ver 0.20.11 (not yet released)
  - ffmpeg: more reliable song duration
  - gme: fix track numbering
 * fix case insensitive search without libicu
+* fix endless loop when accessing malformed file names in ZIP files

 ver 0.20.10 (2017/08/24)
 * decoder

--- a/src/decoder/DecoderThread.cxx
+++ b/src/decoder/DecoderThread.cxx
@@ -508,6 +508,7 @@ try {
 	decoder_run_song(dc, song, uri_utf8, path_fs);
 } catch (...) {
 	dc.state = DecoderState::ERROR;
+	dc.command = DecoderCommand::NONE;
 	dc.error = std::current_exception();
 	dc.client_cond.signal();
 }