https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=9b42474f293d068dcaa65f2f20ca268c51c960ec
commit 9b42474f293d068dcaa65f2f20ca268c51c960ec
Author: Corinna Vinschen <cori...@vinschen.de>
Date: Wed Apr 1 15:31:18 2015 +0200
Fix UTF-16 surrogate handling in wctomb and friends.
* libc/stdlib/wctomb_r.c (__utf8_wctomb): Fix check for handling a
lone high surrogate.
Signed-off-by: Corinna Vinschen <cori...@vinschen.de>
Diff:
---
newlib/ChangeLog | 5 +++++
newlib/libc/stdlib/wctomb_r.c | 2 +-
winsup/cygwin/release/1.7.36 | 3 +++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index e615421..a5a31c7 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-01 Corinna Vinschen <vinsc...@redhat.com>
+
+ * libc/stdlib/wctomb_r.c (__utf8_wctomb): Fix check for handling a
+ lone high surrogate.
+
2015-03-31 Corinna Vinschen <vinsc...@redhat.com>
* libc/time/lcltime_r.c (localtime_r): Call _tzset_unlocked inside
diff --git a/newlib/libc/stdlib/wctomb_r.c b/newlib/libc/stdlib/wctomb_r.c
index 13e1e4c..c93962f 100644
--- a/newlib/libc/stdlib/wctomb_r.c
+++ b/newlib/libc/stdlib/wctomb_r.c
@@ -74,7 +74,7 @@ _DEFUN (__utf8_wctomb, (r, s, wchar, charset, state),
return 0; /* UTF-8 encoding is not state-dependent */
if (sizeof (wchar_t) == 2 && state->__count == -4
- && (wchar < 0xdc00 || wchar >= 0xdfff))
+ && (wchar < 0xdc00 || wchar > 0xdfff))
{
/* There's a leftover lone high surrogate. Write out the CESU-8 value
of the surrogate and proceed to convert the given character. Note
diff --git a/winsup/cygwin/release/1.7.36 b/winsup/cygwin/release/1.7.36
index 21175c9..0515ef9 100644
--- a/winsup/cygwin/release/1.7.36
+++ b/winsup/cygwin/release/1.7.36
@@ -35,3 +35,6 @@ Bug Fixes
- Avoid potential crash at startup or in getgroups(2).
Addresses: https://cygwin.com/ml/cygwin/2015-04/msg00010.html
+
+- Fix UTF-16 surrogate handling in wctomb and friends.
+ Addresses: https://cygwin.com/ml/cygwin/2015-03/msg00452.html
