diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2015-02-17 12:44:26 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2015-02-17 12:44:26 +0000 |
| commit | faa7d78e412294727c4b559edbc5cb49ffd2c05e (patch) | |
| tree | 5228babd1f05ec341272c7f28d635d08b639017c | |
| parent | 06e6dc291cfcb3941742b36fb870a1adafcb4412 (diff) | |
| download | gcc-faa7d78e412294727c4b559edbc5cb49ffd2c05e.zip gcc-faa7d78e412294727c4b559edbc5cb49ffd2c05e.tar.gz gcc-faa7d78e412294727c4b559edbc5cb49ffd2c05e.tar.bz2 | |
re PR libstdc++/65085 (Move-assigned empty string corrupt with -D_GLIBCXX_USE_CXX11_ABI=1)
PR libstdc++/65085
* include/bits/basic_string.h (basic_string(basic_string&&)): Ensure
empty string gets null-terminated.
* testsuite/21_strings/basic_string/cons/char/65085.cc: New.
From-SVN: r220758
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/basic_string.h | 5 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/21_strings/basic_string/cons/char/65085.cc | 40 |
3 files changed, 49 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 63bcfae..951bb91 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2015-02-17 Jonathan Wakely <jwakely@redhat.com> + + PR libstdc++/65085 + * include/bits/basic_string.h (basic_string(basic_string&&)): Ensure + empty string gets null-terminated. + * testsuite/21_strings/basic_string/cons/char/65085.cc: New. + 2015-02-13 Matthew Wahab <matthew.wahab@arm.com> * testsuite/28_regex/traits/char/isctype.cc (test01): Fix diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index 71a47f5..3b2603f 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -476,9 +476,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 { if (__str._M_is_local()) { - if (__str.length()) - traits_type::copy(_M_local_buf, __str._M_local_buf, - _S_local_capacity + 1); + traits_type::copy(_M_local_buf, __str._M_local_buf, + _S_local_capacity + 1); } else { diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/65085.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/65085.cc new file mode 100644 index 0000000..609f7be --- /dev/null +++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/65085.cc @@ -0,0 +1,40 @@ +// Copyright (C) 2015 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// <http://www.gnu.org/licenses/>. + +// { dg-options "-std=gnu++11" } + +#include <string> +#include <new> +#include <cstring> +#include <testsuite_hooks.h> + +void +test01() +{ + std::string s; + char buf[sizeof(std::string)]; + std::memset(buf, 0xff, sizeof(buf)); + std::string* p = ::new(buf) std::string(std::move(s)); + VERIFY((*p)[0] == '\0'); + p->~basic_string(); +} + +int +main() +{ + test01(); +} |