diff options
| author | Max Kellermann <max@duempel.org> | 2014-10-11 21:52:38 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-10-11 21:59:06 +0200 |
| commit | 85301853d6403b400c6545b8072d3962d7b66657 (patch) | |
| tree | 45b2febe8b514b498904e2ede339dca2ada60bb4 | |
| parent | 7cd53fb4527cf6a28b6defd673100d9ea870076d (diff) | |
| download | mpd-85301853d6403b400c6545b8072d3962d7b66657.tar.gz mpd-85301853d6403b400c6545b8072d3962d7b66657.tar.xz mpd-85301853d6403b400c6545b8072d3962d7b66657.zip | |
ThreadInputStream: call ThreadRead() inside the thread instead of Read()
Fixes deadlock bug in the "mms" plugin.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | src/input/ThreadInputStream.cxx | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -1,4 +1,6 @@ ver 0.19.1 (not yet released) +* input + - mms: fix deadlock bug * fix build failure on Mac OS X ver 0.19 (2014/10/10) diff --git a/src/input/ThreadInputStream.cxx b/src/input/ThreadInputStream.cxx index 821ce3e4a..235ed2b01 100644 --- a/src/input/ThreadInputStream.cxx +++ b/src/input/ThreadInputStream.cxx @@ -88,7 +88,7 @@ ThreadInputStream::ThreadFunc() Unlock(); Error error; - size_t nbytes = Read(w.data, w.size, error); + size_t nbytes = ThreadRead(w.data, w.size, error); Lock(); cond.broadcast(); |