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

Fixed overflow checks

Browse Source
This commit is contained in:
Krystian Stasiowski
2019-12-16 16:56:19 -05:00
parent 937542fcad
commit 77030a7e70
2 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/static_string/impl/static_string.hpp
View File

@ -178,8 +178,6 @@ assign(
return *this; return *this;
this->set_size(s.size()); this->set_size(s.size());
auto const n = size() + 1; auto const n = size() + 1;
// VFALCO This informs the static analyzer
//BOOST_BEAST_ASSUME(n != 0);
Traits::copy(data(), &s.data()[0], n); Traits::copy(data(), &s.data()[0], n);
return *this; return *this;
} }
@ -341,7 +339,7 @@ insert(
"index > size()"}); "index > size()"});
if(count > max_size() - curr_size) if(count > max_size() - curr_size)
BOOST_STATIC_STRING_THROW(std::length_error{ BOOST_STATIC_STRING_THROW(std::length_error{
"size() + count > max_size()"}); "count > max_size() - size()"});
const bool inside = s <= &curr_data[curr_size] && s >= curr_data; const bool inside = s <= &curr_data[curr_size] && s >= curr_data;
if (!inside || (inside && ((s - curr_data) + count <= index))) if (!inside || (inside && ((s - curr_data) + count <= index)))
{ {
@ -381,7 +379,7 @@ insert(
const auto curr_data = data(); const auto curr_data = data();
if(count > max_size() - curr_size) if(count > max_size() - curr_size)
BOOST_STATIC_STRING_THROW(std::length_error{ BOOST_STATIC_STRING_THROW(std::length_error{
"size() + count() > max_size()"}); "count() > max_size() - size()"});
auto const index = pos - curr_data; auto const index = pos - curr_data;
Traits::move(&curr_data[index + count], &curr_data[index], curr_size - index); Traits::move(&curr_data[index + count], &curr_data[index], curr_size - index);
this->set_size(curr_size + count); this->set_size(curr_size + count);
@ -523,7 +521,7 @@ append(
const auto curr_size = size(); const auto curr_size = size();
if(count > max_size() - curr_size) if(count > max_size() - curr_size)
BOOST_STATIC_STRING_THROW(std::length_error{ BOOST_STATIC_STRING_THROW(std::length_error{
"size() + count > max_size()"}); "count > max_size() - size()"});
Traits::copy(&data()[curr_size], s, count); Traits::copy(&data()[curr_size], s, count);
this->set_size(curr_size + count); this->set_size(curr_size + count);
term(); term();

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

@ -794,7 +794,7 @@ public:
Inserts `count` copies of character `ch` at the position `index` Inserts `count` copies of character `ch` at the position `index`
@throw std::out_of_range if `index > size()` @throw std::out_of_range if `index > size()`
@throw std::length_error if `size() + count > max_size()` @throw std::length_error if `count > max_size() - size()`
@return `*this` @return `*this`
*/ */
BOOST_STATIC_STRING_CPP14_CONSTEXPR BOOST_STATIC_STRING_CPP14_CONSTEXPR
@ -809,7 +809,7 @@ public:
Inserts null-terminated string pointed to by `s` at the position `index` Inserts null-terminated string pointed to by `s` at the position `index`
@throw std::out_of_range if `index > size()` @throw std::out_of_range if `index > size()`
@throw std::length_error if `size() + count > max_size()` @throw std::length_error if `count > max_size() - size()`
@return `*this` @return `*this`
*/ */
BOOST_STATIC_STRING_CPP14_CONSTEXPR BOOST_STATIC_STRING_CPP14_CONSTEXPR
@ -828,7 +828,7 @@ public:
The inserted string can contain null characters. The inserted string can contain null characters.
@throw std::out_of_range if `index > size()` @throw std::out_of_range if `index > size()`
@throw std::length_error if ` size() + count> max_size()` @throw std::length_error if `count > max_size() - size()`
@return `*this` @return `*this`
*/ */
BOOST_STATIC_STRING_CPP14_CONSTEXPR BOOST_STATIC_STRING_CPP14_CONSTEXPR
@ -845,7 +845,7 @@ public:
The inserted string can contain null characters. The inserted string can contain null characters.
@throw std::out_of_range if `index > size()` @throw std::out_of_range if `index > size()`
@throw std::length_error if `size() + sv.size() > max_size()` @throw std::length_error if `sv.size() > max_size() - size()`
@return `*this` @return `*this`
*/ */
BOOST_STATIC_STRING_CPP14_CONSTEXPR BOOST_STATIC_STRING_CPP14_CONSTEXPR
@ -864,7 +864,7 @@ public:
The inserted string can contain null characters. The inserted string can contain null characters.
@throw std::out_of_range if `index > size() || index_str > sv.size()` @throw std::out_of_range if `index > size() || index_str > sv.size()`
@throw std::length_error if `size() + sv.substr(index_str, count).size() > max_size()` @throw std::length_error if `sv.substr(index_str, count).size() > max_size() - size()`
@return `*this` @return `*this`
*/ */
BOOST_STATIC_STRING_CPP14_CONSTEXPR BOOST_STATIC_STRING_CPP14_CONSTEXPR
@ -884,7 +884,7 @@ public:
The inserted character can be null. The inserted character can be null.
@throw std::length_error if `size() + 1> max_size()` @throw std::length_error if `1 > max_size() - size()`
@return An iterator to the first inserted character or pos if no insertion took place @return An iterator to the first inserted character or pos if no insertion took place
*/ */
BOOST_STATIC_STRING_CPP14_CONSTEXPR BOOST_STATIC_STRING_CPP14_CONSTEXPR
@ -902,7 +902,7 @@ public:
The inserted characters can be null. The inserted characters can be null.
@throw std::length_error if `size() + count > max_size()` @throw std::length_error if `count > max_size() - size()`
@return An iterator to the first inserted character or pos if no insertion took place @return An iterator to the first inserted character or pos if no insertion took place
*/ */
BOOST_STATIC_STRING_CPP14_CONSTEXPR BOOST_STATIC_STRING_CPP14_CONSTEXPR
@ -920,7 +920,7 @@ public:
This function does not participate in overload resolution if This function does not participate in overload resolution if
`InputIterator` does not satisfy <em>LegacyInputIterator</em> `InputIterator` does not satisfy <em>LegacyInputIterator</em>
@throw std::length_error if `size() + std::distance(first, last) > max_size()` @throw std::length_error if `std::distance(first, last) > max_size() - size()`
@return An iterator to the first inserted character or pos if no insertion took place @return An iterator to the first inserted character or pos if no insertion took place
*/ */
template<typename InputIterator> template<typename InputIterator>
@ -943,7 +943,7 @@ public:
The inserted string can contain null characters. The inserted string can contain null characters.
@throw std::length_error if `size() + ilist.size() > max_size()` @throw std::length_error if `ilist.size() > max_size() - size()`
@return An iterator to the first inserted character or pos if no insertion took place @return An iterator to the first inserted character or pos if no insertion took place
*/ */
BOOST_STATIC_STRING_CPP14_CONSTEXPR BOOST_STATIC_STRING_CPP14_CONSTEXPR
@ -964,7 +964,7 @@ public:
`T` is convertible to `string_view` and `T` is not `T` is convertible to `string_view` and `T` is not
convertible to `CharT const*`. convertible to `CharT const*`.
@throw std::length_error if `size() + string_view{t}.substr(index_str, count).size() > max_size()` @throw std::length_error if `string_view{t}.substr(index_str, count).size() > max_size() - size()`
@return `*this` @return `*this`
*/ */
template<typename T> template<typename T>
@ -993,7 +993,7 @@ public:
convertible to `CharT const*`. convertible to `CharT const*`.
@throw std::out_of_range if `index_str > string_view{t}.size()` @throw std::out_of_range if `index_str > string_view{t}.size()`
@throw std::length_error if `size() + string_view{t}.substr(index_str, count).size() > max_size()` @throw std::length_error if `string_view{t}.substr(index_str, count).size() > max_size() - size()`
@return `*this` @return `*this`
*/ */
template<typename T> template<typename T>
@ -1044,7 +1044,7 @@ public:
/** Appends the given character `ch` to the end of the string. /** Appends the given character `ch` to the end of the string.
@throw std::length_error if `size() + 1 > max_size()` @throw std::length_error if `1 > max_size() - size()`
*/ */
BOOST_STATIC_STRING_CPP14_CONSTEXPR BOOST_STATIC_STRING_CPP14_CONSTEXPR
void void
@ -1068,7 +1068,7 @@ public:
The appended characters may be null. The appended characters may be null.
@throw std::length_error if `size() + count > max_size()` @throw std::length_error if `count > max_size() - size()`
@return `*this` @return `*this`
*/ */
BOOST_STATIC_STRING_CPP14_CONSTEXPR BOOST_STATIC_STRING_CPP14_CONSTEXPR
@ -1086,7 +1086,7 @@ public:
The appended string can contain null characters. The appended string can contain null characters.
@throw std::length_error if `size() + sv.size() > max_size()` @throw std::length_error if `sv.size() > max_size() - size()`
@return `*this` @return `*this`
*/ */
BOOST_STATIC_STRING_CPP14_CONSTEXPR BOOST_STATIC_STRING_CPP14_CONSTEXPR
@ -1104,7 +1104,7 @@ public:
The appended string can contain null characters. The appended string can contain null characters.
@throw std::out_of_range if `pos > sv.size()` @throw std::out_of_range if `pos > sv.size()`
@throw std::length_error if `size() + sv.substr(pos, count).size() > max_size()` @throw std::length_error if `sv.substr(pos, count).size() > max_size() - size()`
@return `*this` @return `*this`
*/ */
BOOST_STATIC_STRING_CPP14_CONSTEXPR BOOST_STATIC_STRING_CPP14_CONSTEXPR
@ -1123,7 +1123,7 @@ public:
The appended string can contain null characters. The appended string can contain null characters.
@throw std::length_error if `size() + count > max_size()` @throw std::length_error if `count > max_size() - size()`
@return `*this` @return `*this`
*/ */
BOOST_STATIC_STRING_CPP14_CONSTEXPR BOOST_STATIC_STRING_CPP14_CONSTEXPR
@ -1139,7 +1139,7 @@ public:
The length of the string is determined by the first The length of the string is determined by the first
null character using `Traits::length(s)`. null character using `Traits::length(s)`.
@throw std::length_error if `size() + Traits::length(s) > max_size()` @throw std::length_error if `Traits::length(s) > max_size() - size()`
@return `*this` @return `*this`
*/ */
BOOST_STATIC_STRING_CPP14_CONSTEXPR BOOST_STATIC_STRING_CPP14_CONSTEXPR
@ -1158,7 +1158,7 @@ public:
This function does not participate in overload resolution if This function does not participate in overload resolution if
`InputIterator` does not satisfy <em>LegacyInputIterator</em> `InputIterator` does not satisfy <em>LegacyInputIterator</em>
@throw std::length_error if `size() + std::distance(first, last) > max_size()` @throw std::length_error if `std::distance(first, last) > max_size() - size()`
@return `*this` @return `*this`
*/ */
template<typename InputIterator> template<typename InputIterator>
@ -1184,7 +1184,7 @@ public:
The appended string can contain null characters. The appended string can contain null characters.
@throw std::length_error if `size() + ilist.size() > max_size()` @throw std::length_error if `ilist.size() > max_size() - size()`
@return `*this` @return `*this`
*/ */
BOOST_STATIC_STRING_CPP14_CONSTEXPR BOOST_STATIC_STRING_CPP14_CONSTEXPR
@ -1205,7 +1205,7 @@ public:
`T` is convertible to `string_view` and `T` is not `T` is convertible to `string_view` and `T` is not
convertible to `CharT const*`. convertible to `CharT const*`.
@throw std::length_error if `size() + string_view{t} > max_size()` @throw std::length_error if `string_view{t}.size() > max_size() - size()`
@return `*this` @return `*this`
*/ */
template<typename T> template<typename T>
@ -1236,7 +1236,7 @@ public:
convertible to `CharT const*`. convertible to `CharT const*`.
@throw std::out_of_range if `pos > string_view{t}.size()` @throw std::out_of_range if `pos > string_view{t}.size()`
@throw std::length_error if `size() + string_view{t}.substr(pos, count).size() > max_size()` @throw std::length_error if `string_view{t}.substr(pos, count).size() > max_size() - size()`
@return `*this` @return `*this`
*/ */
template<typename T> template<typename T>
@ -1261,7 +1261,7 @@ public:
/** Append to the string. /** Append to the string.
@throw std::length_error if `size() + s.size() > max_size()` @throw std::length_error if `s.size() > max_size() - size()`
*/ */
template<std::size_t M> template<std::size_t M>
BOOST_STATIC_STRING_CPP14_CONSTEXPR BOOST_STATIC_STRING_CPP14_CONSTEXPR
@ -1276,7 +1276,7 @@ public:
Appends the given character `ch` to the end of the string. Appends the given character `ch` to the end of the string.
@throw std::length_error if `size() + 1 > max_size()` @throw std::length_error if `1 > max_size() - size()`
*/ */
BOOST_STATIC_STRING_CPP14_CONSTEXPR BOOST_STATIC_STRING_CPP14_CONSTEXPR
basic_static_string& basic_static_string&
@ -1294,7 +1294,7 @@ public:
The length of the string is determined by the first The length of the string is determined by the first
null character using `Traits::length(s)`. null character using `Traits::length(s)`.
@throw std::length_error if `size() + Traits::length(s) > max_size()` @throw std::length_error if `Traits::length(s) > max_size() - size()`
@return `*this` @return `*this`
*/ */
BOOST_STATIC_STRING_CPP14_CONSTEXPR BOOST_STATIC_STRING_CPP14_CONSTEXPR
@ -1311,7 +1311,7 @@ public:
The appended string can contain null characters. The appended string can contain null characters.
@throw std::length_error if `size() + ilist.size() > max_size()` @throw std::length_error if `ilist.size() > max_size() - size()`
@return `*this` @return `*this`
*/ */
BOOST_STATIC_STRING_CPP14_CONSTEXPR BOOST_STATIC_STRING_CPP14_CONSTEXPR