From owner-svn-src-projects@freebsd.org Sat Aug 8 19:30:00 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 465FD9B68D0 for ; Sat, 8 Aug 2015 19:30:00 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.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 2DFABB6C; Sat, 8 Aug 2015 19:30:00 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t78JU0Xa010376; Sat, 8 Aug 2015 19:30:00 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t78JU0V3010358; Sat, 8 Aug 2015 19:30:00 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201508081930.t78JU0V3010358@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 8 Aug 2015 19:30:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r286465 - projects/collation/lib/libc/regex X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Aug 2015 19:30:00 -0000 Author: bapt Date: Sat Aug 8 19:29:59 2015 New Revision: 286465 URL: https://svnweb.freebsd.org/changeset/base/286465 Log: The regex code does not work with multibyte codesets like UTF-8. In fact, it doesn't even work with single-byte codesets like ISO-8859-1. The comparison blows up at index 128 (the range is 0 to UCHAR_MAX (255). As a temporary workaround, all comparisons will be done in C locale regardless of the environment setting. The regex library needs to be updated to handle all codesets. Obtained from: Dragonfly Modified: projects/collation/lib/libc/regex/regcomp.c Modified: projects/collation/lib/libc/regex/regcomp.c ============================================================================== --- projects/collation/lib/libc/regex/regcomp.c Sat Aug 8 19:24:32 2015 (r286464) +++ projects/collation/lib/libc/regex/regcomp.c Sat Aug 8 19:29:59 2015 (r286465) @@ -38,6 +38,13 @@ * @(#)regcomp.c 8.5 (Berkeley) 3/20/94 */ +/* + * This implementation currently only works with C locale + * It's definitely limited by UCHAR_MAX, but not even ISO-8859 charsets + * are working. The forced changing of locale to C for the comparison + * is considered a workaround until a better solution is found. + */ + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)regcomp.c 8.5 (Berkeley) 3/20/94"; #endif /* LIBC_SCCS and not lint */ @@ -768,8 +775,9 @@ p_b_term(struct parse *p, cset *cs) char c; wint_t start, finish; wint_t i; + locale_t loc = &__xlocale_C_locale; /* see note under license */ struct xlocale_collate *table = - (struct xlocale_collate*)__get_locale()->components[XLC_COLLATE]; + (struct xlocale_collate*)loc->components[XLC_COLLATE]; /* classify what we've got */ switch ((MORE()) ? PEEK() : '\0') {