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

Revert "AsyncInputStream: fix assertion failure in AppendToBuffer()"

Browse Source 
This reverts commit 966c4244cb.

The commit was bad, because the bug was really in
NfsInputStream::DoRead(); see previous commit.
This commit is contained in:
Max Kellermann 2014-06-21 14:07:15 +02:00
parent 3e4e6f7ced
commit a877926f08
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/input/AsyncInputStream.cxx
View File

@ -222,13 +222,11 @@ AsyncInputStream::AppendToBuffer(const void *data, size_t append_size)
const size_t remaining = append_size - nbytes; const size_t remaining = append_size - nbytes;
if (remaining > 0) { if (remaining > 0) {
w = buffer.Write(); w = buffer.Write();
assert(!w.IsEmpty());
assert(w.size >= remaining);
if (!w.IsEmpty()) { memcpy(w.data, (const uint8_t *)data + nbytes, remaining);
size_t nbytes2 = std::min(w.size, remaining); buffer.Append(remaining);
memcpy(w.data, (const uint8_t *)data + nbytes,
nbytes2);
buffer.Append(nbytes2);
}
} }
if (!IsReady()) if (!IsReady())