From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22223 invoked by alias); 4 May 2011 12:45:16 -0000 Received: (qmail 22201 invoked by uid 22791); 4 May 2011 12:45:15 -0000 X-SWARE-Spam-Status: No, hits=-6.3 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 04 May 2011 12:44:57 +0000 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p44CivIV006903 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 4 May 2011 08:44:57 -0400 Received: from hase (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p44CiswN031407 for ; Wed, 4 May 2011 08:44:56 -0400 From: Andreas Schwab To: libc-hacker@sourceware.org Subject: [PATCH] Make sure mbrtowc can reset internal state after encoding error X-Yow: I request a weekend in Havana with Phil Silvers! Date: Wed, 04 May 2011 12:45:00 -0000 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sourceware.org X-SW-Source: 2011-05/txt/msg00001.txt.bz2 2011-05-04 Andreas Schwab * 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."