Skip to content

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

ThreadInputStream: call ThreadRead() inside the thread instead of Read()

Fixes deadlock bug in the "mms" plugin.
parent 7cd53fb4
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
NEWS
View file @ 85301853
ver 0.19.1 (not yet released) ver 0.19.1 (not yet released)
* input
- mms: fix deadlock bug
* fix build failure on Mac OS X * fix build failure on Mac OS X
ver 0.19 (2014/10/10) ver 0.19 (2014/10/10)
......
src/input/ThreadInputStream.cxx
View file @ 85301853
...@@ -88,7 +88,7 @@ ThreadInputStream::ThreadFunc() ...@@ -88,7 +88,7 @@ ThreadInputStream::ThreadFunc()
Unlock(); Unlock();
Error error; Error error;
size_t nbytes = Read(w.data, w.size, error); size_t nbytes = ThreadRead(w.data, w.size, error);
Lock(); Lock();
cond.broadcast(); cond.broadcast();
......
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