feedc0de/boost_static_string
1
0
Fork 0
forked from boostorg/static_string
Code Pull Requests Activity

Fix assign

Browse Source
This commit is contained in:
Krystian Stasiowski
2020-02-15 19:14:41 -05:00
parent 7ddc82c43f
commit f552f3e675
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/boost/static_string/static_string.hpp
View File

@ -4891,9 +4891,10 @@ assign(
auto ptr = data(); auto ptr = data();
for (std::size_t i = 0; first != last; ++first, ++ptr, ++i) for (std::size_t i = 0; first != last; ++first, ++ptr, ++i)
{ {
if (1 > max_size() - i) if (i >= max_size())
{ {
this->set_size(i); this->set_size(i);
term();
BOOST_STATIC_STRING_THROW(std::length_error{"n > max_size()"}); BOOST_STATIC_STRING_THROW(std::length_error{"n > max_size()"});
} }
traits_type::assign(*ptr, *first); traits_type::assign(*ptr, *first);
@ -5482,7 +5483,7 @@ read_back(
for (; first != last; ++first) for (; first != last; ++first)
{ {
BOOST_STATIC_STRING_THROW_IF( BOOST_STATIC_STRING_THROW_IF(
1 > max_size() - new_size, std::length_error{"count > max_size() - size()"}); new_size >= max_size(), std::length_error{"count > max_size() - size()"});
traits_type::assign(curr_data[++new_size], *first); traits_type::assign(curr_data[++new_size], *first);
} }
return new_size - size(); return new_size - size();