util/PeakBuffer: use IsEmpty() instead of IsNull()

The DynamicFifoBuffer methods never return nullptr when the buffer is empty or full; instead, they return an empty buffer. This bug caused an endless loop.

util/PeakBuffer: use IsEmpty() instead of IsNull()
52dca859 · Max Kellermann · f5443163 · 52dca859 · 52dca859
Commit 52dca859 authored Dec 19, 2013 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

FullyBufferedSocket.cxx src/event/FullyBufferedSocket.cxx +1 -1

PeakBuffer.cxx src/util/PeakBuffer.cxx +3 -3

No files found.
--- a/src/event/FullyBufferedSocket.cxx
+++ b/src/event/FullyBufferedSocket.cxx
@@ -60,7 +60,7 @@ FullyBufferedSocket::Flush()
 	assert(IsDefined());

 	const auto data = output.Read();
-	if (data.IsNull()) {
+	if (data.IsEmpty()) {
 		IdleMonitor::Cancel();
 		CancelWrite();
 		return true;

--- a/src/util/PeakBuffer.cxx
+++ b/src/util/PeakBuffer.cxx
@@ -43,13 +43,13 @@ PeakBuffer::Read() const
 {
 	if (normal_buffer != nullptr) {
 		const auto p = normal_buffer->Read();
-		if (!p.IsNull())
+		if (!p.IsEmpty())
 			return p.ToVoid();
 	}

 	if (peak_buffer != nullptr) {
 		const auto p = peak_buffer->Read();
-		if (!p.IsNull())
+		if (!p.IsEmpty())
 			return p.ToVoid();
 	}

@@ -85,7 +85,7 @@ AppendTo(DynamicFifoBuffer<uint8_t> &buffer, const void *data, size_t length)

 	do {
 		const auto p = buffer.Write();
-		if (p.IsNull())
+		if (p.IsEmpty())
 			break;

 		const size_t nbytes = std::min(length, p.size);