Fix an off-by-one error in basic_string::__grow_by, where it would incorrectly throw length_error (instead of bad_alloc) when attempting to resize the string to 'max_size()'. Add tests for resizing to max_size +/-1
llvm-svn: 194151
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: e42732232752f9c4b099cd15f23d0c319e9e3c38
diff --git a/include/string b/include/string
index 234eb6b..e8bd69f 100644
--- a/include/string
+++ b/include/string
@@ -2181,7 +2181,7 @@
size_type __n_copy, size_type __n_del, size_type __n_add)
{
size_type __ms = max_size();
- if (__delta_cap > __ms - __old_cap - 1)
+ if (__delta_cap > __ms - __old_cap)
this->__throw_length_error();
pointer __old_p = __get_pointer();
size_type __cap = __old_cap < __ms / 2 - __alignment ?
diff --git a/test/strings/basic.string/string.capacity/max_size.pass.cpp b/test/strings/basic.string/string.capacity/max_size.pass.cpp
index f9b2284..0fe7f12 100644
--- a/test/strings/basic.string/string.capacity/max_size.pass.cpp
+++ b/test/strings/basic.string/string.capacity/max_size.pass.cpp
@@ -18,15 +18,45 @@
template <class S>
void
+test1(const S& s)
+{
+ S s2(s);
+ const size_t sz = s2.max_size() - 1;
+ try { s2.resize(sz, 'x'); }
+ catch ( const std::bad_alloc & ) { return ; }
+ assert ( s2.size() == sz );
+}
+
+template <class S>
+void
+test2(const S& s)
+{
+ S s2(s);
+ const size_t sz = s2.max_size();
+ try { s2.resize(sz, 'x'); }
+ catch ( const std::bad_alloc & ) { return ; }
+ assert ( s.size() == sz );
+}
+
+template <class S>
+void
+test3(const S& s)
+{
+ S s2(s);
+ const size_t sz = s2.max_size() + 1;
+ try { s2.resize(sz, 'x'); }
+ catch ( const std::length_error & ) { return ; }
+ assert ( false );
+}
+
+template <class S>
+void
test(const S& s)
{
assert(s.max_size() >= s.size());
- {
- S s2;
- try { s2.resize(s2.max_size() - 1, 'x'); }
- catch ( const std::bad_alloc & ) { return ; }
- assert ( false );
- }
+ test1(s);
+ test2(s);
+ test3(s);
}
int main()