OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Jonathan Wakely 2015-02-17 12:44:26 +00:00 committed by Jonathan Wakely
parent 06e6dc291c
commit faa7d78e41
3 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -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

5
libstdc++-v3/include/bits/basic_string.h
View File

@ -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
{

40
libstdc++-v3/testsuite/21_strings/basic_string/cons/char/65085.cc Normal file
View File

@ -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();
}