From a877926f087aa86ef90bb8b194f6f8e620fff568 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 21 Jun 2014 14:07:15 +0200 Subject: Revert "AsyncInputStream: fix assertion failure in AppendToBuffer()" This reverts commit 966c4244cbe0de174df1e72e917078269ec9dbb9. The commit was bad, because the bug was really in NfsInputStream::DoRead(); see previous commit. --- src/input/AsyncInputStream.cxx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/input/AsyncInputStream.cxx b/src/input/AsyncInputStream.cxx index 9b827463d..43190f907 100644 --- a/src/input/AsyncInputStream.cxx +++ b/src/input/AsyncInputStream.cxx @@ -222,13 +222,11 @@ AsyncInputStream::AppendToBuffer(const void *data, size_t append_size) const size_t remaining = append_size - nbytes; if (remaining > 0) { w = buffer.Write(); + assert(!w.IsEmpty()); + assert(w.size >= remaining); - if (!w.IsEmpty()) { - size_t nbytes2 = std::min(w.size, remaining); - memcpy(w.data, (const uint8_t *)data + nbytes, - nbytes2); - buffer.Append(nbytes2); - } + memcpy(w.data, (const uint8_t *)data + nbytes, remaining); + buffer.Append(remaining); } if (!IsReady()) -- cgit v1.2.3