diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-12-08 04:56:09 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-12-08 04:56:09 +0000 |
| commit | 3b187ccb86c5ad5fe969f788d8a635e9f7bbdc5f (patch) | |
| tree | edcb5e88e045694c8cd7ee4d25c6c87931c828fe | |
| parent | 76a2102b0874ed777309caf846b5f4d021bb830d (diff) | |
| download | glibc-3b187ccb86c5ad5fe969f788d8a635e9f7bbdc5f.tar.gz glibc-3b187ccb86c5ad5fe969f788d8a635e9f7bbdc5f.tar.xz glibc-3b187ccb86c5ad5fe969f788d8a635e9f7bbdc5f.zip | |
Update.
* iconvdata/ansi_x3.110.c (from_ansi_x3_110): Don't increment pointers if character is illegal. Reported by Bruno Haible <haible@ilog.fr>. Reported by Bruno Haible <haible@ilog.fr>.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | iconvdata/ansi_x3.110.c | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index fe45168239..0cb37f0140 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,16 @@ 1999-12-07 Ulrich Drepper <drepper@cygnus.com> + * iconvdata/ansi_x3.110.c (from_ansi_x3_110): Don't increment + pointers if character is illegal. + Reported by Bruno Haible <haible@ilog.fr>. + * iconv/gconv_db.c (gen_steps): Set __counter initialy to 1. (increment_counter): New function. Broken out of find_derivation. (find_derivation): No need for a lock. Increment counter only when the derivation was already available. * iconv/gconv_dl.c: Add debugging functions. (known_compare): We have to use strcmp. + Reported by Bruno Haible <haible@ilog.fr>. 1999-12-06 Ulrich Drepper <drepper@cygnus.com> diff --git a/iconvdata/ansi_x3.110.c b/iconvdata/ansi_x3.110.c index 9371c5ae55..35658b50d4 100644 --- a/iconvdata/ansi_x3.110.c +++ b/iconvdata/ansi_x3.110.c @@ -399,6 +399,7 @@ static const char from_ucs4[][2] = #define BODY \ { \ uint32_t ch = *inptr; \ + int incr; \ \ if (ch >= 0xc1 && ch <= 0xcf) \ { \ @@ -424,12 +425,12 @@ static const char from_ucs4[][2] = \ ch = to_ucs4_comb[ch - 0xc1][ch2 - 0x20]; \ \ - inptr += 2; \ + incr = 2; \ } \ else \ { \ ch = to_ucs4[ch]; \ - ++inptr; \ + incr = 1; \ } \ \ if (ch == 0 && *inptr != '\0') \ @@ -439,6 +440,7 @@ static const char from_ucs4[][2] = break; \ } \ \ + inptr += incr; \ *((uint32_t *) outptr)++ = ch; \ } #include <iconv/loop.c> |