From 3b187ccb86c5ad5fe969f788d8a635e9f7bbdc5f Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 8 Dec 1999 04:56:09 +0000
Subject: 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>.
---
 iconvdata/ansi_x3.110.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'iconvdata/ansi_x3.110.c')

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>
-- 
cgit v1.2.3