aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-04-24 16:37:05 +0000
committerUlrich Drepper <drepper@redhat.com>2009-04-24 16:37:05 +0000
commitf397be127c20a04c55a0545c0950dcb8acd03eaa (patch)
tree2b05e33524c3d2a2b2bce413a16b0c89dbb848ed
parent705341a92faad6305f47511f57ab46af19c10645 (diff)
downloadglibc-f397be127c20a04c55a0545c0950dcb8acd03eaa.zip
glibc-f397be127c20a04c55a0545c0950dcb8acd03eaa.tar.gz
glibc-f397be127c20a04c55a0545c0950dcb8acd03eaa.tar.bz2
* iconvdata/sjis.c (BODY): Don't advance inptr before
STANDARD_FROM_LOOP_ERR_HANDLER (2) for 2 byte invalid input. Use STANDARD_FROM_LOOP_ERR_HANDLER with 2 instead of 1 for two byte chars.
-rw-r--r--ChangeLog7
-rw-r--r--iconvdata/sjis.c28
2 files changed, 23 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 667688d..70c7e48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-04-24 Jakub Jelinek <jakub@redhat.com>
+
+ * iconvdata/sjis.c (BODY): Don't advance inptr before
+ STANDARD_FROM_LOOP_ERR_HANDLER (2) for 2 byte invalid input.
+ Use STANDARD_FROM_LOOP_ERR_HANDLER with 2 instead of 1 for
+ two byte chars.
+
2009-04-24 Ulrich Drepper <drepper@redhat.com>
* locale/locarchive.h (struct locarhandle): Rename len field to
diff --git a/iconvdata/sjis.c b/iconvdata/sjis.c
index 4561779..f907615 100644
--- a/iconvdata/sjis.c
+++ b/iconvdata/sjis.c
@@ -1,5 +1,5 @@
/* Mapping tables for SJIS handling.
- Copyright (C) 1997-2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1997-2001, 2002, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -4372,15 +4372,19 @@ static const char from_ucs4_extra[0x100][2] =
\
ch2 = inptr[1]; \
idx = ch * 256 + ch2; \
- if (__builtin_expect (ch2 < 0x40, 0) \
- || (__builtin_expect (idx > 0x84be, 0) && idx < 0x889f) \
- || (__builtin_expect (idx > 0x88fc, 0) && idx < 0x8940) \
- || (__builtin_expect (idx > 0x9ffc, 0) && idx < 0xe040) \
- || __builtin_expect (idx > 0xeaa4, 0)) \
+ if (__builtin_expect (ch2 < 0x40, 0)) \
{ \
/* This is illegal. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
} \
+ else if ((__builtin_expect (idx > 0x84be && idx < 0x889f, 0)) \
+ || (__builtin_expect (idx > 0x88fc && idx < 0x8940, 0)) \
+ || (__builtin_expect (idx > 0x9ffc && idx < 0xe040, 0)) \
+ || __builtin_expect (idx > 0xeaa4, 0)) \
+ { \
+ /* This is illegal. */ \
+ STANDARD_FROM_LOOP_ERR_HANDLER (2); \
+ } \
else \
{ \
/* We could pack the data a bit more dense. The second \
@@ -4395,13 +4399,13 @@ static const char from_ucs4_extra[0x100][2] =
else \
ch = cjk_block4[(ch - 0xe0) * 192 + ch2 - 0x40]; \
\
- inptr += 2; \
- } \
+ if (__builtin_expect (ch == 0, 0)) \
+ { \
+ /* This is an illegal character. */ \
+ STANDARD_FROM_LOOP_ERR_HANDLER (2); \
+ } \
\
- if (__builtin_expect (ch == 0, 0)) \
- { \
- /* This is an illegal character. */ \
- STANDARD_FROM_LOOP_ERR_HANDLER (2); \
+ inptr += 2; \
} \
} \
\