about summary refs log tree commit diff
path: root/iconv
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-04-24 19:00:54 +0000
committerUlrich Drepper <drepper@redhat.com>2009-04-24 19:00:54 +0000
commit9c32c895e01e69ae9760fb078ee785555e97bae6 (patch)
treea6e961968521f5c5b51cff34e844f0e23df18f6d /iconv
parentc9edc8891dac165b8446cdd11db4304f9faf01d8 (diff)
downloadglibc-9c32c895e01e69ae9760fb078ee785555e97bae6.tar.gz
glibc-9c32c895e01e69ae9760fb078ee785555e97bae6.tar.xz
glibc-9c32c895e01e69ae9760fb078ee785555e97bae6.zip
	* iconv/gconv_simple.c (BODY for UTF-8 to INTERNAL): Don't accept
	UTF-16 surrogates.
Diffstat (limited to 'iconv')
-rw-r--r--iconv/gconv_simple.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/iconv/gconv_simple.c b/iconv/gconv_simple.c
index 5cf3237abb..e34f3770ad 100644
--- a/iconv/gconv_simple.c
+++ b/iconv/gconv_simple.c
@@ -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;						      \