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

re PR libstdc++/66441 (wstring_convert not working correctly)

Browse Source 
PR libstdc++/66441
	* testsuite/22_locale/conversions/string/66441.cc: New.
	* include/bits/locale_conv.h (__do_str_codecvt): Reserve enough space
	in the output string for BOM and complete result.

From-SVN: r224222
This commit is contained in:
Jonathan Wakely 2015-06-08 14:03:45 +01:00 committed by Jonathan Wakely
parent 9b999e8c82
commit c00f4f5fb3
3 changed files with 56 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,10 @@
2015-06-08 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/66441
* testsuite/22_locale/conversions/string/66441.cc: New.
* include/bits/locale_conv.h (__do_str_codecvt): Reserve enough space
in the output string for BOM and complete result.
PR libstdc++/66417
* src/c++11/codecvt.cc (write_utf16_code_point): Use adjust_byte_order
for single UTF-16 units.

4
libstdc++-v3/include/bits/locale_conv.h
View File

@ -60,12 +60,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{
size_t __outchars = 0;
auto __next = __first;
const auto __maxlen = __cvt.max_length();
const auto __maxlen = __cvt.max_length() + 1;
codecvt_base::result __result;
do
{
__outstr.resize(__outstr.size() + (__last - __next) + __maxlen);
__outstr.resize(__outstr.size() + (__last - __next) * __maxlen);
auto __outnext = &__outstr.front() + __outchars;
auto const __outlast = &__outstr.back() + 1;
__result = (__cvt.*__fn)(__state, __next, __last, __next,

49
libstdc++-v3/testsuite/22_locale/conversions/string/66441.cc Normal file
View File

@ -0,0 +1,49 @@
// 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" }
// libstdc++/66441
#include <locale>
#include <codecvt>
#include <testsuite_hooks.h>
void
test01()
{
// convert from UCS-4 to UTF16BE with BOM.
using cvt = std::codecvt_utf16<char32_t, 0x10FFFF, std::generate_header>;
std::wstring_convert<cvt, char32_t> conv;
auto to = conv.to_bytes(U"ab\u00e7");
VERIFY( to.length() == 8 );
VERIFY( (unsigned char)to[0] == 0xfe );
VERIFY( (unsigned char)to[1] == 0xff );
VERIFY( (unsigned char)to[2] == 0x00 );
VERIFY( (unsigned char)to[3] == 0x61 );
VERIFY( (unsigned char)to[4] == 0x00 );
VERIFY( (unsigned char)to[5] == 0x62 );
VERIFY( (unsigned char)to[6] == 0x00 );
VERIFY( (unsigned char)to[7] == 0xe7 );
}
int
main()
{
test01();
}