From: Andreas Schwab <schwab@redhat.com>
To: libc-hacker@sourceware.org
Subject: [PATCH] Make sure mbrtowc can reset internal state after encoding error
Date: Wed, 04 May 2011 12:45:00 -0000 [thread overview]
Message-ID: <m3k4e6bpo9.fsf@redhat.com> (raw)
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."
next reply other threads:[~2011-05-04 12:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-04 12:45 Andreas Schwab [this message]
2011-05-04 21:08 ` Ulrich Drepper
2011-05-05 8:09 ` Andreas Schwab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m3k4e6bpo9.fsf@redhat.com \
--to=schwab@redhat.com \
--cc=libc-hacker@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).