public inbox for libc-hacker@sourceware.org
 help / color / mirror / Atom feed
* [PATCH] Make sure mbrtowc can reset internal state after encoding error
@ 2011-05-04 12:45 Andreas Schwab
  2011-05-04 21:08 ` Ulrich Drepper
  0 siblings, 1 reply; 3+ messages in thread
From: Andreas Schwab @ 2011-05-04 12:45 UTC (permalink / raw)
  To: libc-hacker

2011-05-04  Andreas Schwab  <schwab@redhat.com>

	* iconv/loop.c (SINGLE(LOOPFCT)): Reset conversion state after an
	encoding error.
---
 iconv/loop.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/iconv/loop.c b/iconv/loop.c
index da11bc2..d16d23a 100644
--- a/iconv/loop.c
+++ b/iconv/loop.c
@@ -477,6 +477,15 @@ SINGLE(LOOPFCT) (struct __gconv_step *step,
 	state->__value.__wchb[inlen++] = *inptr++;
 #endif
     }
+  else if (result == __GCONV_ILLEGAL_INPUT)
+    {
+      /* Clear the state buffer.  */
+#ifdef CLEAR_STATE
+      CLEAR_STATE;
+#else
+      state->__count &= ~7;
+#endif
+    }
 
   return result;
 }
-- 
1.7.4.4


-- 
Andreas Schwab, schwab@redhat.com
GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84  5EC7 45C6 250E 6F00 984E
"And now for something completely different."

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] Make sure mbrtowc can reset internal state after encoding error
  2011-05-04 12:45 [PATCH] Make sure mbrtowc can reset internal state after encoding error Andreas Schwab
@ 2011-05-04 21:08 ` Ulrich Drepper
  2011-05-05  8:09   ` Andreas Schwab
  0 siblings, 1 reply; 3+ messages in thread
From: Ulrich Drepper @ 2011-05-04 21:08 UTC (permalink / raw)
  To: Andreas Schwab; +Cc: libc-hacker

On Wed, May 4, 2011 at 08:44, Andreas Schwab <schwab@redhat.com> wrote:
> 2011-05-04  Andreas Schwab  <schwab@redhat.com>
>
>        * iconv/loop.c (SINGLE(LOOPFCT)): Reset conversion state after an
>        encoding error.

Why?  This is deliberately not done.  If the conversion routines
report problems and they insist on continuing then they can reset the
state themselves on demand.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] Make sure mbrtowc can reset internal state after encoding error
  2011-05-04 21:08 ` Ulrich Drepper
@ 2011-05-05  8:09   ` Andreas Schwab
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas Schwab @ 2011-05-05  8:09 UTC (permalink / raw)
  To: Ulrich Drepper; +Cc: libc-hacker

https://bugzilla.redhat.com/show_bug.cgi?id=504789

Andreas.

-- 
Andreas Schwab, schwab@redhat.com
GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84  5EC7 45C6 250E 6F00 984E
"And now for something completely different."

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-05-05  8:09 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-05-04 12:45 [PATCH] Make sure mbrtowc can reset internal state after encoding error Andreas Schwab
2011-05-04 21:08 ` Ulrich Drepper
2011-05-05  8:09   ` Andreas Schwab

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).