diff options
| author |   stsp <stsp@openbsd.org> | 2014-05-03 14:10:20 +0000 |
|---|---|---|
| committer | stsp <stsp@openbsd.org> | 2014-05-03 14:10:20 +0000 |
| commit | 2d1d6f4d83b8ea8aff97c2c329f5a1559b5467bf (patch) | |
| tree | 6193d3ea32d711d629dab34edc10342c93cd3bb6 | |
| parent | Add #ifndef NO_PRINTF_PERCENT_N. Since we are fully standardized, we (diff) | |
| download | wireguard-openbsd-2d1d6f4d83b8ea8aff97c2c329f5a1559b5467bf.tar.xz wireguard-openbsd-2d1d6f4d83b8ea8aff97c2c329f5a1559b5467bf.zip | |
Noncharacters 0xFFFE and 0xFFFF don't render a UTF-8 string invalid
so stop rejecting them in our citrus UTF-8 parser.
This is a common misinterpretation of the Unicode standard which resulted
in a corrigendum last year: http://www.unicode.org/versions/corrigendum9.html
Pointed out by jilles@freebsd (via pfg@freebsd), thanks!
| -rw-r--r-- | lib/libc/citrus/citrus_utf8.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/libc/citrus/citrus_utf8.c b/lib/libc/citrus/citrus_utf8.c index a6a2e70527a..df0f19c88c6 100644 --- a/lib/libc/citrus/citrus_utf8.c +++ b/lib/libc/citrus/citrus_utf8.c @@ -1,4 +1,4 @@ -/* $OpenBSD: citrus_utf8.c,v 1.6 2012/12/05 23:19:59 deraadt Exp $ */ +/* $OpenBSD: citrus_utf8.c,v 1.7 2014/05/03 14:10:20 stsp Exp $ */ /*- * Copyright (c) 2002-2004 Tim J. Robbins @@ -161,8 +161,7 @@ _citrus_utf8_ctype_mbrtowc(wchar_t * __restrict pwc, errno = EILSEQ; return ((size_t)-1); } - if ((wch >= 0xd800 && wch <= 0xdfff) || - wch == 0xfffe || wch == 0xffff) { + if (wch >= 0xd800 && wch <= 0xdfff) { /* * Malformed input; invalid code points. */ |