This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH] Fix a regression bug included by commit e64d2de52.
From: "Carlos O'Donell" <carlos@systemhalted.org>
Date: Mon, 2 Apr 2012 20:04:59 -0400
> A multiline comment should be written:
>
> /* foo
> bar. */
>
> The +1 should be written with spaces:
>
> inptr + 1 != inend
>
> OK with those fixes.
Done, and committed.
--------------------
[PATCH] 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.
---
ChangeLog | 6 ++++++
iconvdata/tcvn5712-1.c | 5 +++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8705429..09f040e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-02 Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>
+
+ [BZ #13691]
+ * iconvdata/tcvn5712-1.c (FROM_LOOP): Test end of input using
+ inptr and inend, rather than using last_ch.
+
2012-04-02 David S. Miller <davem@davemloft.net>
With help from Paul Eggert, Carlos O'Donell, and Roland McGrath.
diff --git a/iconvdata/tcvn5712-1.c b/iconvdata/tcvn5712-1.c
index 09dcbbf..90c8610 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) \
{ \
--
1.7.9.1