commit f258c201e6c0d88f627ba5e3617bbd0dd5abeac5
author Marshall Clow <mclow.lists@gmail.com> Tue Jan 31 03:40:52 2017 +0000
committer Marshall Clow <mclow.lists@gmail.com> Tue Jan 31 03:40:52 2017 +0000
tree 4c25b31370c0132af4b41f2d76303a4d88036c81
parent 876b2d81679c556e959e5f236e2350d634d76c1c

Fix PR#31779: basic_string::operator= isn't exception safe.

llvm-svn: 293599
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: d107be846f20568a26a41f408ed2ee70cd903833

include/string

diff --git a/include/string b/include/string
index ba311ef..9a85797 100644
--- a/include/string
+++ b/include/string
@@ -1367,12 +1367,28 @@
     _LIBCPP_INLINE_VISIBILITY
     void __copy_assign_alloc(const basic_string& __str, true_type)
         {
-            if (__alloc() != __str.__alloc())
+            if (__alloc() == __str.__alloc())
+                __alloc() = __str.__alloc();
+            else
             {
-                clear();
-                shrink_to_fit();
+                if (!__str.__is_long())
+                {
+                    clear();
+                    shrink_to_fit();
+                    __alloc() = __str.__alloc();
+                }
+                else
+                {
+                    allocator_type __a = __str.__alloc();
+                    pointer __p = __alloc_traits::allocate(__a, __str.__get_long_cap());
+                    clear();
+                    shrink_to_fit();
+                    __alloc() = _VSTD::move(__a);
+                    __set_long_pointer(__p);
+                    __set_long_cap(__str.__get_long_cap());
+                    __set_long_size(__str.size());
+                }
             }
-            __alloc() = __str.__alloc();
         }
 
     _LIBCPP_INLINE_VISIBILITY