about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-06-28 18:11:30 +0000
committerUlrich Drepper <drepper@redhat.com>2000-06-28 18:11:30 +0000
commit392ac9698469dbf25826fa8dcd21811dd8abe5e8 (patch)
tree2e76fe580626ba23236857883ec2c9833765622d
parent044ff6223a1787c61eca915338e8be61e1eb9b42 (diff)
downloadglibc-392ac9698469dbf25826fa8dcd21811dd8abe5e8.tar.gz
glibc-392ac9698469dbf25826fa8dcd21811dd8abe5e8.tar.xz
glibc-392ac9698469dbf25826fa8dcd21811dd8abe5e8.zip
Update.
	* iconvdata/euc-jp.c: In conversion to UCS4, handling invalid
	sequences with first by 0x8e correctly.
-rw-r--r--ChangeLog3
-rw-r--r--iconvdata/euc-jp.c10
-rw-r--r--localedata/ChangeLog3
3 files changed, 16 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 11b9096208..3a73d1c53b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-06-28  Ulrich Drepper  <drepper@redhat.com>
 
+	* iconvdata/euc-jp.c: In conversion to UCS4, handling invalid
+	sequences with first by 0x8e correctly.
+
 	* iconvdata/jis0208.h: Remove redundant test.
 
 2000-06-27  Ulrich Drepper  <drepper@redhat.com>
diff --git a/iconvdata/euc-jp.c b/iconvdata/euc-jp.c
index fc0794d700..39cf6a8b7a 100644
--- a/iconvdata/euc-jp.c
+++ b/iconvdata/euc-jp.c
@@ -96,6 +96,16 @@
 	  {								      \
 	    /* This is code set 2: half-width katakana.  */		      \
 	    ch = jisx0201_to_ucs4 (ch2);				      \
+	    if (__builtin_expect (ch, 0) == __UNKNOWN_10646_CHAR)	      \
+	      {								      \
+		/* Illegal character.  */				      \
+		if (! ignore_errors_p ())				      \
+		  {							      \
+		    /* This is an illegal character.  */		      \
+		    result = __GCONV_ILLEGAL_INPUT;			      \
+		    break;						      \
+		  }							      \
+									      \
 	    inptr += 2;							      \
 	  }								      \
 	else								      \
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index df947d7ee8..b5becf70ad 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,8 @@
 2000-06-28  Ulrich Drepper  <drepper@redhat.com>
 
+	* locales/iso14651_t1: Explicitly add control character in
+	U0000-U001F and U007F-U009F range for backward compatibility.
+
 	* locales/i18n: Correct problems found by test suite.
 
 2000-06-28  Andreas Jaeger  <aj@suse.de>