RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 10:47:35 +00:00
Code Issues Activity Actions

LibCore: FileStream.h: Fix infinite loop when trying to read past end-of-file.

Browse source
This commit is contained in:
asynts 2020-09-03 19:08:04 +02:00 • committed by Andreas Kling
parent 612c1bc84d
commit b9a6c07bb7
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Libraries/LibCore/FileStream.h
View file

@ -65,16 +65,15 @@ public:
size_t read(Bytes bytes) override
{
size_t nread = 0;
auto nread = m_buffered.bytes().copy_trimmed_to(bytes);
if (!m_buffered.is_empty()) {
nread += m_buffered.bytes().copy_trimmed_to(bytes);
m_buffered.bytes().slice(nread, m_buffered.size() - nread).copy_to(m_buffered);
m_buffered.trim(m_buffered.size() - nread);
m_buffered.bytes().slice(nread).copy_to(m_buffered);
m_buffered.trim(m_buffered.size() - nread);
}
while (nread < bytes.size()) {
if (m_file->eof())
return nread;
while (nread < bytes.size() && !eof()) {
if (m_file->has_error()) {
set_fatal_error();
return 0;