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

output/Thread: re-lock the mutex after flush error

Browse Source 
Fixes deadlock due to mutex double lock.
This commit is contained in:
Max Kellermann
2018-01-29 22:30:56 +01:00
parent 6908555ed3
commit eb771eaf0d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/output/Thread.cxx
View File

@@ -379,11 +379,11 @@ PlayFull(FilteredAudioOutput &output, ConstBuffer<void> _buffer)
inline void inline void
AudioOutputControl::InternalDrain() noexcept AudioOutputControl::InternalDrain() noexcept
{ {
const ScopeUnlock unlock(mutex);
try { try {
/* flush the filter and play its remaining output */ /* flush the filter and play its remaining output */
const ScopeUnlock unlock(mutex);
while (true) { while (true) {
auto buffer = source.Flush(); auto buffer = source.Flush();
if (buffer.IsNull()) if (buffer.IsNull())
@@ -391,14 +391,14 @@ AudioOutputControl::InternalDrain() noexcept
PlayFull(*output, buffer); PlayFull(*output, buffer);
} }
output->Drain();
} catch (...) { } catch (...) {
FormatError(std::current_exception(), FormatError(std::current_exception(),
"Failed to flush filter on %s", GetLogName()); "Failed to flush filter on %s", GetLogName());
InternalCloseError(std::current_exception()); InternalCloseError(std::current_exception());
return; return;
} }
output->Drain();
} }
void void