MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-06-02 18:18:56 +02:00
Code Issues Releases Wiki Activity

ircd::server: Fix chunked encoding offset error.

Browse source
This commit is contained in:
Jason Volk 2020-09-29 16:05:03 -07:00
parent b7b2c44973
commit d594719e1f
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ircd/server.cc
View file

@ -3700,7 +3700,10 @@ ircd::server::tag::read_chunk_dynamic_head(const const_buffer &buffer,
assert(size(chunk_head_scratch) >= state.chunk_read + size(buffer));
const const_buffer chunk_head_buffer
{
chunk_head_scratch, state.chunk_read + size(buffer)
recursion_level > 0? buffer: const_buffer
{
chunk_head_scratch, state.chunk_read + size(buffer)
}
};
// informal search for head terminator
@ -3718,15 +3721,16 @@ ircd::server::tag::read_chunk_dynamic_head(const const_buffer &buffer,
}
// This indicates how much head was just received from this buffer only.
assert(pos + size(http::line::terminator) >= state.chunk_read);
assert(recursion_level == 0 || pos + size(http::line::terminator) <= size(buffer));
assert(recursion_level >= 1 || pos + size(http::line::terminator) <= size(chunk_head_buffer));
const size_t addl_head_bytes
{
pos + size(http::line::terminator) - state.chunk_read
std::min(pos + size(http::line::terminator), size(buffer))
};
// The received buffer may go past the end of the head.
assert(addl_head_bytes >= size(http::line::terminator));
assert(addl_head_bytes <= size(buffer));
assert(size(buffer) >= addl_head_bytes);
const size_t beyond_head_length
{
size(buffer) - addl_head_bytes