about summary refs log tree commit diff
path: root/iconvdata
diff options
context:
space:
mode:
authorTulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>2012-04-02 15:24:03 -0700
committerDavid S. Miller <davem@davemloft.net>2012-04-02 17:12:07 -0700
commit39c59c35723120c32dc42dde4115bba92305179f (patch)
treef958bc6ec732f81a8d0b00c5352ad0e3111e8957 /iconvdata
parent135ffda8b84226a91c6062db69a61975b2f11cb6 (diff)
downloadglibc-39c59c35723120c32dc42dde4115bba92305179f.tar.gz
glibc-39c59c35723120c32dc42dde4115bba92305179f.tar.xz
glibc-39c59c35723120c32dc42dde4115bba92305179f.zip
Fix bug in previous tcvn5712 commit e64d2de52.
	[BZ #13691]
	* iconvdata/tcvn5712-1.c (FROM_LOOP): Test end of input using
	inptr and inend, rather than using last_ch.
Diffstat (limited to 'iconvdata')
-rw-r--r--iconvdata/tcvn5712-1.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/iconvdata/tcvn5712-1.c b/iconvdata/tcvn5712-1.c
index 09dcbbfac9..90c8610f96 100644
--- a/iconvdata/tcvn5712-1.c
+++ b/iconvdata/tcvn5712-1.c
@@ -378,8 +378,9 @@ static const struct
     /* Determine whether there is a buffered character pending.  */	      \
     last_ch = *statep >> 3;						      \
 									      \
-    /* We have to buffer ch if it is a possible match in comp_table_data.  */ \
-    must_buffer_ch = last_ch && (ch >= 0x0041 && ch <= 0x01b0);		      \
+    /* We have to buffer ch if it is a possible match in comp_table_data      \
+       and if it isn't the last char of the string.  */			      \
+    must_buffer_ch = (ch >= 0x0041 && ch <= 0x01b0) && (inptr + 1 != inend);  \
 									      \
     if (last_ch)							      \
       {									      \