From 4f03875418e8d9df12f819a0baeaece1cc7c13e7 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Fri, 13 Sep 2013 18:32:42 +0000 Subject: [PATCH] re PR libstdc++/58415 (__sso_string_base move constructor does not null terminate local data when moving from empty string) 2013-09-13 Paolo Carlini PR libstdc++/58415 * include/ext/sso_string_base.h (__sso_string_base<>:: __sso_string_base(__sso_string_base&&)): Fix thinkos about _M_length vs _M_set_length. * testsuite/ext/vstring/cons/58415-1.cc: New. * testsuite/ext/vstring/cons/58415-2.cc: Likewise. From-SVN: r202574 --- libstdc++-v3/ChangeLog | 9 ++++ libstdc++-v3/include/ext/sso_string_base.h | 4 +- .../testsuite/ext/vstring/cons/58415-1.cc | 41 +++++++++++++++++++ .../testsuite/ext/vstring/cons/58415-2.cc | 38 +++++++++++++++++ 4 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 libstdc++-v3/testsuite/ext/vstring/cons/58415-1.cc create mode 100644 libstdc++-v3/testsuite/ext/vstring/cons/58415-2.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 159fec6c66f..8e0bfb70f8c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2013-09-13 Paolo Carlini + + PR libstdc++/58415 + * include/ext/sso_string_base.h (__sso_string_base<>:: + __sso_string_base(__sso_string_base&&)): Fix thinkos about + _M_length vs _M_set_length. + * testsuite/ext/vstring/cons/58415-1.cc: New. + * testsuite/ext/vstring/cons/58415-2.cc: Likewise. + 2013-09-12 Paolo Carlini PR libstdc++/58403 diff --git a/libstdc++-v3/include/ext/sso_string_base.h b/libstdc++-v3/include/ext/sso_string_base.h index 9e5b50e6e24..6cb4302b688 100644 --- a/libstdc++-v3/include/ext/sso_string_base.h +++ b/libstdc++-v3/include/ext/sso_string_base.h @@ -361,9 +361,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_capacity(__rcs._M_allocated_capacity); } - _M_length(__rcs._M_length()); - __rcs._M_length(0); + _M_set_length(__rcs._M_length()); __rcs._M_data(__rcs._M_local_data); + __rcs._M_set_length(0); } #endif diff --git a/libstdc++-v3/testsuite/ext/vstring/cons/58415-1.cc b/libstdc++-v3/testsuite/ext/vstring/cons/58415-1.cc new file mode 100644 index 00000000000..cfcb8938e26 --- /dev/null +++ b/libstdc++-v3/testsuite/ext/vstring/cons/58415-1.cc @@ -0,0 +1,41 @@ +// { dg-options "-std=gnu++11" } +// { dg-require-string-conversions "" } + +// Copyright (C) 2013 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 +// . + +#include +#include + +typedef __gnu_cxx::__versa_string string; + +void test01() +{ + bool test __attribute__((unused)) = true; + + string s1("string"); + string s2(""); + std::swap(s1, s2); + + VERIFY( s1.c_str()[0] == '\0' ); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/ext/vstring/cons/58415-2.cc b/libstdc++-v3/testsuite/ext/vstring/cons/58415-2.cc new file mode 100644 index 00000000000..9ba192ab228 --- /dev/null +++ b/libstdc++-v3/testsuite/ext/vstring/cons/58415-2.cc @@ -0,0 +1,38 @@ +// { dg-options "-std=gnu++11" } +// { dg-require-string-conversions "" } + +// Copyright (C) 2013 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 +// . + +#include +#include + +typedef __gnu_cxx::__versa_string string; + +void test01() +{ + string s1; + string s2 = std::move(s1); + + VERIFY( s2.c_str()[0] == '\0' ); +} + +int main() +{ + test01(); + return 0; +}