FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PR libstdc++/79511 fix endianness of UTF-16 data

Browse source 
PR libstdc++/79511
	* src/c++11/codecvt.cc (write_utf16_code_point): Don't write 0xffff
	as a surrogate pair.
	(__codecvt_utf8_utf16_base<char32_t>::do_in): Use native endianness
	for internal representation.
	(__codecvt_utf8_utf16_base<wchar_t>::do_in): Likewise.
	* testsuite/22_locale/codecvt/codecvt_utf8_utf16/79511.cc: New test.

From-SVN: r246199
This commit is contained in:
Jonathan Wakely 2017-03-16 15:27:45 +00:00 • committed by Jonathan Wakely
parent 8d85abab44
commit 02e12bda2d
3 changed files with 79 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View file

@ -1,5 +1,13 @@
2017-03-16 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/79511
* src/c++11/codecvt.cc (write_utf16_code_point): Don't write 0xffff
as a surrogate pair.
(__codecvt_utf8_utf16_base<char32_t>::do_in): Use native endianness
for internal representation.
(__codecvt_utf8_utf16_base<wchar_t>::do_in): Likewise.
* testsuite/22_locale/codecvt/codecvt_utf8_utf16/79511.cc: New test.
PR libstdc++/80064
* include/bits/stl_heap.h (__is_heap, push_heap, __adjust_heap)
(pop_heap, make_heap, sort_heap, is_heap_until, is_heap): Cope with

14
libstdc++-v3/src/c++11/codecvt.cc
View file

@ -315,7 +315,7 @@ namespace
{
static_assert(sizeof(C) >= 2, "a code unit must be at least 16-bit");
if (codepoint < max_single_utf16_unit)
if (codepoint <= max_single_utf16_unit)
{
if (to.size() > 0)
{
@ -1341,7 +1341,11 @@ do_in(state_type&, const extern_type* __from, const extern_type* __from_end,
{
range<const char> from{ __from, __from_end };
range<char32_t> to{ __to, __to_end };
auto res = utf16_in(from, to, _M_maxcode, _M_mode);
codecvt_mode mode = codecvt_mode(_M_mode & (consume_header|generate_header));
#if __BYTE_ORDER__ != __ORDER_BIG_ENDIAN__
mode = codecvt_mode(mode | little_endian);
#endif
auto res = utf16_in(from, to, _M_maxcode, mode);
__from_next = from.next;
__to_next = to.next;
return res;
@ -1411,7 +1415,11 @@ do_in(state_type&, const extern_type* __from, const extern_type* __from_end,
{
range<const char> from{ __from, __from_end };
range<wchar_t> to{ __to, __to_end };
auto res = utf16_in(from, to, _M_maxcode, _M_mode);
codecvt_mode mode = codecvt_mode(_M_mode & (consume_header|generate_header));
#if __BYTE_ORDER__ != __ORDER_BIG_ENDIAN__
mode = codecvt_mode(mode | little_endian);
#endif
auto res = utf16_in(from, to, _M_maxcode, mode);
__from_next = from.next;
__to_next = to.next;
return res;

60
libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8_utf16/79511.cc Normal file
View file

@ -0,0 +1,60 @@
// Copyright (C) 2017 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-do run { target c++11 } }
#include <locale>
#include <codecvt>
#include <testsuite_hooks.h>
// PR libstdc++/79511
template<typename ElemT>
std::basic_string<ElemT> conv(const char* src)
{
std::wstring_convert<std::codecvt_utf8_utf16<ElemT>, ElemT> conv;
return conv.from_bytes(src);
}
void
test01()
{
static char const src[] = "\xEF\xBF\xBF";
VERIFY( conv<char16_t>(src) == u"\xffff" );
VERIFY( conv<char32_t>(src) == U"\xffff" );
#ifdef _GLIBCXX_USE_WCHAR_T
VERIFY( conv<wchar_t>(src) == L"\xffff" );
#endif
}
void
test02()
{
static char const src[] = "\xE2\x82\xAC";
VERIFY( conv<char16_t>(src) == u"\x20ac" );
VERIFY( conv<char32_t>(src) == U"\x20ac" );
#ifdef _GLIBCXX_USE_WCHAR_T
VERIFY( conv<wchar_t>(src) == L"\x20ac" );
#endif
}
int
main()
{
test01();
test02();
}