diff options
| author | Stefan Sperling <stsp@cvs.openbsd.org> | 2010-08-05 17:13:54 +0000 |
|---|---|---|
| committer | Stefan Sperling <stsp@cvs.openbsd.org> | 2010-08-05 17:13:54 +0000 |
| commit | 805467f4c2ae2a6decc81e7c653f213c8866a752 (patch) | |
| tree | 6600ad87a6d1ff40f20a6378b45b55d126e1f03b /lib | |
| parent | b661d6eec13d962fd9d03f37a7975bc08bb9f2d4 (diff) | |
The UTF-8 decoder should not accept byte sequences which decode to unicode
code positions U+D800 to U+DFFF (UTF-16 surrogates), U+FFFE, and U+FFFF.
http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
http://unicode.org/faq/utf_bom.html#utf8-4
ok phessler, millert, miod, deraadt
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/citrus/citrus_utf8.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/libc/citrus/citrus_utf8.c b/lib/libc/citrus/citrus_utf8.c index 0ead0c7946d..45d07d74a57 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.2 2010/07/29 00:50:10 stsp Exp $ */ +/* $OpenBSD: citrus_utf8.c,v 1.3 2010/08/05 17:13:53 stsp Exp $ */ /*- * Copyright (c) 2002-2004 Tim J. Robbins @@ -162,6 +162,14 @@ _citrus_utf8_ctype_mbrtowc(wchar_t * __restrict pwc, errno = EILSEQ; return ((size_t)-1); } + if ((wch >= 0xd800 && wch <= 0xdfff) || + wch == 0xfffe || wch == 0xffff) { + /* + * Malformed input; invalid code points. + */ + errno = EILSEQ; + return ((size_t)-1); + } if (pwc != NULL) *pwc = wch; us->want = 0; |