boostorg/beast
1
0
Fork 1
mirror of https://github.com/boostorg/beast.git synced 2026-05-04 11:44:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes and tidying for flat_buffer:

Browse Source 
* Fix reserve() size calculation
* Improved test coverage
This commit is contained in:
Vinnie Falco
2018-12-15 15:49:39 -08:00
parent 477e5a6f98
commit b367776c37
5 changed files with 225 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/beast/core/impl/flat_buffer.hpp
+5 -6
View File
@@ -253,7 +253,7 @@ reserve(std::size_t n)
if(max_ < n)
max_ = n;
if(capacity() < n)
prepare(n - capacity());
prepare(n - size());
}
template<class Allocator>
@@ -293,13 +293,16 @@ basic_flat_buffer<Allocator>::
prepare(std::size_t n) ->
mutable_buffers_type
{
auto const len = size();
if(len > max_ || n > (max_ - len))
BOOST_THROW_EXCEPTION(std::length_error{
"basic_flat_buffer too long"});
if(n <= dist(out_, end_))
{
// existing capacity is sufficient
last_ = out_ + n;
return{out_, n};
}
auto const len = size();
if(n <= capacity() - len)
{
// after a memmove,
@@ -311,10 +314,6 @@ prepare(std::size_t n) ->
last_ = out_ + n;
return {out_, n};
}
// enforce maximum capacity
if(n > max_ - len)
BOOST_THROW_EXCEPTION(std::length_error{
"basic_flat_buffer overflow"});
// allocate a new buffer
auto const new_size = (std::min<std::size_t>)(
max_,