MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2025-01-14 16:46:50 +01:00
Code Issues Releases Wiki Activity

ircd::server: Move insufficient buffer checks into the creator functions.

Browse source
This commit is contained in:
Jason Volk 2018-03-20 01:23:42 -07:00
parent c8b80046d1
commit 0ba91776d1
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ircd/server.cc
View file

@ -2052,16 +2052,6 @@ ircd::server::tag::read_head(const const_buffer &buffer,
if(pos == string_view::npos)
{
state.head_read += size(buffer);
// Check that the user hasn't run out of head buffer space without
// seeing a terminator. If so, we have to throw out of here and then
// abort this user's request.
if(unlikely(state.head_read >= size(req.in.head)))
throw buffer_overrun
{
"Supplied buffer of %zu too small for HTTP head", size(req.in.head)
};
return {};
}
@ -2277,9 +2267,11 @@ const
assert(request);
const auto &req{*request};
const auto &head{req.in.head};
const auto &content{req.in.content};
if(state.head_read >= size(head))
return {};
if(unlikely(state.head_read >= size(req.in.head)))
throw buffer_overrun
{
"Supplied buffer of %zu too small for HTTP head", size(req.in.head)
};
const size_t remaining
{
@ -2302,9 +2294,15 @@ const
assert(request);
const auto &req{*request};
const auto &content{req.in.content};
if(unlikely(size(content) <= state.content_read))
throw buffer_overrun
{
"Content buffer of %zu bytes too small to read %zu bytes of content",
size(content),
state.content_length
};
// The amount of bytes we still have to read to for the response
assert(size(content) >= state.content_read);
const size_t remaining
{
size(content) - state.content_read