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

AsyncInputStream: fix assertion failure in AppendToBuffer()

Browse Source
This commit is contained in:
Max Kellermann 2014-06-17 02:45:43 +02:00
parent 81283f8bcb
commit 966c4244cb
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/input/AsyncInputStream.cxx
View File

@ -222,11 +222,13 @@ 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);
memcpy(w.data, (const uint8_t *)data + nbytes, remaining); if (!w.IsEmpty()) {
buffer.Append(remaining); size_t nbytes2 = std::min(w.size, remaining);
memcpy(w.data, (const uint8_t *)data + nbytes,
nbytes2);
buffer.Append(nbytes2);
}
} }
if (!IsReady()) if (!IsReady())