diff mbox

libstdc++/66417 fix codecvt_utf16 bigendian

Message ID 20150608110816.GT12728@redhat.com
State New
Headers show

Commit Message

Jonathan Wakely June 8, 2015, 11:08 a.m. UTC 
I forgot to swap the byte-order for codepoints that fit in a single
UTF-16 character, fixed like so.

Tested powerpc64-linux and powerpc64le-linux.

Committing to trunk and gcc-5-branch.
diff mbox

Patch

commit cc2dca496553bba0d09db49b98ccef0d728d9a36
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Mon Jun 8 11:38:04 2015 +0100

    	PR libstdc++/66417
    	* src/c++11/codecvt.cc (write_utf16_code_point): Use adjust_byte_order
    	for single UTF-16 units.
    	* testsuite/22_locale/codecvt/codecvt_utf16/66417.cc: New.

diff --git a/libstdc++-v3/src/c++11/codecvt.cc b/libstdc++-v3/src/c++11/codecvt.cc
index 83ee6e0..2a11ca3 100644
--- a/libstdc++-v3/src/c++11/codecvt.cc
+++ b/libstdc++-v3/src/c++11/codecvt.cc
@@ -319,7 +319,7 @@  namespace
       {
 	if (to.size() > 0)
 	  {
-	    *to.next = codepoint;
+	    *to.next = adjust_byte_order(codepoint, mode);
 	    ++to.next;
 	    return true;
 	  }
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf16/66417.cc b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf16/66417.cc
new file mode 100644
index 0000000..f9e4291
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf16/66417.cc
@@ -0,0 +1,76 @@ 
+// 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 <codecvt>
+#include <testsuite_hooks.h>
+
+using namespace std;
+
+void
+test01()
+{
+  constexpr auto mode = generate_header;
+  codecvt_utf16<char32_t, 0x10ffff, mode> cvt;
+  mbstate_t state{};
+  const char32_t* from = U"ABC";
+  const char32_t* from_next;
+  char to[100];
+  char* to_next;
+
+  cvt.out(state, from, from + 3, from_next, to, to + 100, to_next);
+
+  VERIFY((unsigned char)to[0] == 0xfe);
+  VERIFY((unsigned char)to[1] == 0xff);
+  VERIFY(to[2] == 0x00);
+  VERIFY(to[3] == 0x41);
+  VERIFY(to[4] == 0x00);
+  VERIFY(to[5] == 0x42);
+  VERIFY(to[6] == 0x00);
+  VERIFY(to[7] == 0x43);
+}
+
+void
+test02()
+{
+  constexpr auto mode = codecvt_mode(generate_header|little_endian);
+  codecvt_utf16<char32_t, 0x10ffff, mode> cvt;
+  mbstate_t state{};
+  const char32_t* from = U"ABC";
+  const char32_t* from_next;
+  char to[100];
+  char* to_next;
+
+  cvt.out(state, from, from + 3, from_next, to, to + 100, to_next);
+
+  VERIFY((unsigned char)to[0] == 0xff);
+  VERIFY((unsigned char)to[1] == 0xfe);
+  VERIFY(to[2] == 0x41);
+  VERIFY(to[3] == 0x00);
+  VERIFY(to[4] == 0x42);
+  VERIFY(to[5] == 0x00);
+  VERIFY(to[6] == 0x43);
+  VERIFY(to[7] == 0x00);
+}
+
+int
+main()
+{
+  test01();
+  test02();
+}