From owner-svn-src-head@FreeBSD.ORG  Thu May  1 01:42:49 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 11EB2B56;
 Thu,  1 May 2014 01:42:49 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0003010A1;
 Thu,  1 May 2014 01:42:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s411gmQ3068252;
 Thu, 1 May 2014 01:42:48 GMT (envelope-from pfg@svn.freebsd.org)
Received: (from pfg@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s411gm8F068251;
 Thu, 1 May 2014 01:42:48 GMT (envelope-from pfg@svn.freebsd.org)
Message-Id: <201405010142.s411gm8F068251@svn.freebsd.org>
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Thu, 1 May 2014 01:42:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r265167 - head/lib/libc/locale
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 May 2014 01:42:49 -0000

Author: pfg
Date: Thu May  1 01:42:48 2014
New Revision: 265167
URL: http://svnweb.freebsd.org/changeset/base/265167

Log:
  citrus: Avoid invalid code points.
  
  From the OpenBSD log:
  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
  
  Reported by:	Stefan Sperling
  Obtained from:	OpenBSD
  MFC after:	5 days

Modified:
  head/lib/libc/locale/utf8.c

Modified: head/lib/libc/locale/utf8.c
==============================================================================
--- head/lib/libc/locale/utf8.c	Thu May  1 00:31:19 2014	(r265166)
+++ head/lib/libc/locale/utf8.c	Thu May  1 01:42:48 2014	(r265167)
@@ -203,8 +203,7 @@ _UTF8_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.
 		 */