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

input/nfs: never read more than space available in buffer

Browse Source 
Avoids off-by-one bug and obsoletes the bug fix in commit 966c4244
This commit is contained in:
Max Kellermann 2014-06-21 14:06:31 +02:00
parent 936eb43c0e
commit 3e4e6f7ced
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/input/plugins/NfsInputPlugin.cxx
View File

@ -93,12 +93,14 @@ NfsInputStream::DoRead()
if (remaining <= 0) if (remaining <= 0)
return true; return true;
if (IsBufferFull()) { const size_t buffer_space = GetBufferSpace();
if (buffer_space == 0) {
Pause(); Pause();
return true; return true;
} }
size_t nbytes = std::min<uint64_t>(remaining, 32768); size_t nbytes = std::min<size_t>(std::min<uint64_t>(remaining, 32768),
buffer_space);
mutex.unlock(); mutex.unlock();
Error error; Error error;