diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2015-04-01 15:31:18 +0200 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2015-04-01 15:31:18 +0200 |
| commit | 829c8f6c2dc1b849f5037ce7b27f4b7b00b257e9 (patch) | |
| tree | 3840186418107fc505ba7a51dc45d36164e83939 | |
| parent | 849044a1e92553789fab9843fbdca507bf6c14d7 (diff) | |
| download | cygnal-829c8f6c2dc1b849f5037ce7b27f4b7b00b257e9.tar.gz cygnal-829c8f6c2dc1b849f5037ce7b27f4b7b00b257e9.tar.bz2 cygnal-829c8f6c2dc1b849f5037ce7b27f4b7b00b257e9.zip | |
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 <corinna@vinschen.de>
| -rw-r--r-- | newlib/ChangeLog | 5 | ||||
| -rw-r--r-- | newlib/libc/stdlib/wctomb_r.c | 2 | ||||
| -rw-r--r-- | winsup/cygwin/release/1.7.36 | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index e615421d1..a5a31c7b0 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,8 @@ +2015-04-01 Corinna Vinschen <vinschen@redhat.com> + + * libc/stdlib/wctomb_r.c (__utf8_wctomb): Fix check for handling a + lone high surrogate. + 2015-03-31 Corinna Vinschen <vinschen@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 13e1e4c36..c93962fa4 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 21175c9ac..0515ef96e 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 |