OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[BZ #10093]

Browse Source 
* iconv/gconv_simple.c (BODY for UTF-8 to INTERNAL): Don't accept
	UTF-16 surrogates.
This commit is contained in:
Ulrich Drepper 2009-04-24 19:00:54 +00:00
parent c9edc8891d
commit 9c32c895e0
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2009-04-24 Ulrich Drepper <drepper@redhat.com>
[BZ #10093]
* iconv/gconv_simple.c (BODY for UTF-8 to INTERNAL): Don't accept
UTF-16 surrogates.
* locale/programs/locarchive.c (enlarge_archive): Conserve address
space when temporarily mapping the whole content of the old file.

6
iconv/gconv_simple.c
View File

@ -1,5 +1,5 @@
/* Simple transformations functions.
Copyright (C) 1997-2005, 2007, 2008 Free Software Foundation, Inc.
Copyright (C) 1997-2005, 2007, 2008, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@ -1037,7 +1037,9 @@ ucs4le_internal_loop_single (struct __gconv_step *step,
/* If i < cnt, some trail byte was not >= 0x80, < 0xc0. \
If cnt > 2 and ch < 2^(5*cnt-4), the wide character ch could \
have been represented with fewer than cnt bytes. */ \
if (i < cnt || (cnt > 2 && (ch >> (5 * cnt - 4)) == 0)) \
if (i < cnt || (cnt > 2 && (ch >> (5 * cnt - 4)) == 0) \
/* Do not accept UTF-16 surrogates. */ \
|| (ch >= 0xd800 && ch <= 0xdfff)) \
{ \
/* This is an illegal encoding. */ \
goto errout; \