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

Avoids off-by-one bug and obsoletes the bug fix in commit 966c4244

input/nfs: never read more than space available in buffer
3e4e6f7c · Max Kellermann · 936eb43c · 3e4e6f7c
Commit 3e4e6f7c authored Jun 21, 2014 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

NfsInputPlugin.cxx src/input/plugins/NfsInputPlugin.cxx +4 -2

No files found.
--- a/src/input/plugins/NfsInputPlugin.cxx
+++ b/src/input/plugins/NfsInputPlugin.cxx
@@ -93,12 +93,14 @@ NfsInputStream::DoRead()
 	if (remaining <= 0)
 		return true;
-	if (IsBufferFull()) {
+	const size_t buffer_space = GetBufferSpace();
+	if (buffer_space == 0) {
 		Pause();
 		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();
 	Error error;