RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 07:07:34 +00:00
Code Issues Activity Actions

AK: Fix reading across chunks in DuplexMemoryStream

Browse source
This commit is contained in:
AnotherTest 2020-12-07 10:36:04 +03:30 • committed by Andreas Kling
parent cd8268e6fb
commit 3c41487db7
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
AK/MemoryStream.h
View file

@ -252,7 +252,7 @@ public:
size_t nread = 0; size_t nread = 0;
while (bytes.size() - nread > 0 && m_write_offset - m_read_offset - nread > 0) { while (bytes.size() - nread > 0 && m_write_offset - m_read_offset - nread > 0) {
const auto chunk_index = (m_read_offset - m_base_offset + nread) / chunk_size; const auto chunk_index = (m_read_offset - m_base_offset + nread) / chunk_size;
const auto chunk_bytes = m_chunks[chunk_index].bytes().slice(m_read_offset % chunk_size).trim(m_write_offset - m_read_offset - nread); const auto chunk_bytes = m_chunks[chunk_index].bytes().slice((m_read_offset + nread) % chunk_size).trim(m_write_offset - m_read_offset - nread);
nread += chunk_bytes.copy_trimmed_to(bytes.slice(nread)); nread += chunk_bytes.copy_trimmed_to(bytes.slice(nread));
} }
@ -279,8 +279,7 @@ public:
return false; return false;
} }
read(bytes); return read(bytes) == bytes.size();
return true;
} }
size_t write(ReadonlyBytes bytes) override size_t write(ReadonlyBytes bytes) override