commit 2267c5d7f800d72cc971d3eb80ab6dd2461ea455
author Marshall Clow <mclow.lists@gmail.com> Wed Nov 06 14:24:38 2013 +0000
committer Marshall Clow <mclow.lists@gmail.com> Wed Nov 06 14:24:38 2013 +0000
tree 48a0d4ea498a885366ad6655cb23d0bbdb3a7d88
parent ae38538798027d63a2fe80bf3530c3dcb0a5f3f6

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

include/string

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 ?