RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-23 13:17:36 +00:00
Code Issues Activity Actions

CIODevice: Don't discard already-buffered data when there's no more to read.

Browse source 
When we had some data already in the CIODevice buffer, we should make sure
we always return that data, even if the attempt to ::read() even more data
fails. This was causing us to lose partial HTTP payloads.
This commit is contained in:
Andreas Kling 2019-06-22 23:07:42 +02:00
parent ec99f7f721
commit 6d5633904f
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
LibCore/CIODevice.cpp
View file

@ -29,8 +29,9 @@ ByteBuffer CIODevice::read(int max_size)
auto buffer = ByteBuffer::create_uninitialized(max_size);
auto* buffer_ptr = (char*)buffer.pointer();
int remaining_buffer_space = buffer.size();
int taken_from_buffered = 0;
if (!m_buffered_data.is_empty()) {
int taken_from_buffered = min(remaining_buffer_space, m_buffered_data.size());
taken_from_buffered = min(remaining_buffer_space, m_buffered_data.size());
memcpy(buffer_ptr, m_buffered_data.data(), taken_from_buffered);
Vector<byte> new_buffered_data;
new_buffered_data.append(m_buffered_data.data() + taken_from_buffered, m_buffered_data.size() - taken_from_buffered);
@ -42,14 +43,22 @@ ByteBuffer CIODevice::read(int max_size)
return buffer;
int nread = ::read(m_fd, buffer_ptr, remaining_buffer_space);
if (nread < 0) {
if (taken_from_buffered) {
buffer.trim(taken_from_buffered);
return buffer;
}
set_error(errno);
return {};
}
if (nread == 0) {
set_eof(true);
if (taken_from_buffered) {
buffer.trim(taken_from_buffered);
return buffer;
}
return {};
}
buffer.trim(nread);
buffer.trim(taken_from_buffered + nread);
return buffer;
}