From patchwork Mon Jun 10 10:23:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 1945837 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=tpsDOpBy; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=Xeqsmhnl; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=tpsDOpBy; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=Xeqsmhnl; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VySZW18xKz20V0 for ; Mon, 10 Jun 2024 20:23:47 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 39FCB3858C33 for ; Mon, 10 Jun 2024 10:23:45 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id 425553858D28 for ; Mon, 10 Jun 2024 10:23:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 425553858D28 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 425553858D28 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718015010; cv=none; b=hR+eQmLchH2G+ePPHUNQTl6cQra9z1CJVqaxpXM2rqzHTa9gP+O+aA5ThQkSWunP2sgKgH4o+Jq3aH6g51BKbnkfjEPJvVtaHBSPqI5nz3m6yrbvg7cxJUsde3/RkILlMqfSS2Gaz49Wy7T3k2CZsFeQOrcqWNZhM7ot8JlTUKs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718015010; c=relaxed/simple; bh=YcJ9zP7Xz63MEtSr+kESiW9Swhq4yW7bva55VPSmP2c=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=hcqexn1tu4SccskH04NOPdEdweS8fiHTaCYOQIUmwIEzliD3FrplkcvsykoWCJfxnrNX4uDLHCsokJ6a/FYnaCNO1Boa3339vey7e6tvTcb7v32S/qIsYLmoyy1aild7FDodAivXTXysDNAvKt2y5MHxzMQj+05WQnP0JfWpUrk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from hawking.nue2.suse.org (unknown [10.168.4.11]) by smtp-out2.suse.de (Postfix) with ESMTP id 43F7B1F7C0 for ; Mon, 10 Jun 2024 10:23:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1718015008; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=65JUjAvvOYhxHNLxYhm42QKGu49p5dL3KtpaljJHPO8=; b=tpsDOpByglTZhHrZlHh727nhAkzkWTcy6UJL+WTfTLxf1X0lLZEI4tEm9YIkEm80LPRJs4 rVF79sCEeoHXVkz4ze86jqm2ebSs0J1l8tciL+AlBSpaZEzhFvOAoCYUDx639BFus29Lc+ fx/Krr4NpFaEvQNwoMhU/pNlxtgExN0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1718015008; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=65JUjAvvOYhxHNLxYhm42QKGu49p5dL3KtpaljJHPO8=; b=XeqsmhnlZdbEo+jwmv1mH1F7AM9JOMbHdRvpJoJx9Jx8Zzb3wfWOThLXRl2+uGM4VxD9SS ZikOSsA+hkDxSKDQ== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1718015008; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=65JUjAvvOYhxHNLxYhm42QKGu49p5dL3KtpaljJHPO8=; b=tpsDOpByglTZhHrZlHh727nhAkzkWTcy6UJL+WTfTLxf1X0lLZEI4tEm9YIkEm80LPRJs4 rVF79sCEeoHXVkz4ze86jqm2ebSs0J1l8tciL+AlBSpaZEzhFvOAoCYUDx639BFus29Lc+ fx/Krr4NpFaEvQNwoMhU/pNlxtgExN0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1718015008; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=65JUjAvvOYhxHNLxYhm42QKGu49p5dL3KtpaljJHPO8=; b=XeqsmhnlZdbEo+jwmv1mH1F7AM9JOMbHdRvpJoJx9Jx8Zzb3wfWOThLXRl2+uGM4VxD9SS ZikOSsA+hkDxSKDQ== Received: by hawking.nue2.suse.org (Postfix, from userid 17005) id 3411E4A0570; Mon, 10 Jun 2024 12:23:28 +0200 (CEST) From: Andreas Schwab To: libc-alpha@sourceware.org Subject: [PATCH] iconv: Fix matching of multi-character transliterations (bug 31859) X-Yow: .. the HIGHWAY is made out of LIME JELLO and my HONDA is a barbequed OYSTER! Yum! Date: Mon, 10 Jun 2024 12:23:28 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Spam-Score: -4.00 X-Spam-Level: X-Spamd-Result: default: False [-4.00 / 50.00]; BAYES_HAM(-2.80)[99.15%]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-0.997]; MIME_GOOD(-0.10)[text/plain]; RCVD_NO_TLS_LAST(0.10)[]; RCPT_COUNT_ONE(0.00)[1]; FUZZY_BLOCKED(0.00)[rspamd.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_NONE(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email] X-Spam-Status: No, score=-9.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Only return __GCONV_INCOMPLETE_INPUT for a partial match when the end of the input buffer is reached. Otherwise it is a non-match, and other patterns should be tried. --- iconv/gconv_trans.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iconv/gconv_trans.c b/iconv/gconv_trans.c index 08b7a3f71d..44f0fd849a 100644 --- a/iconv/gconv_trans.c +++ b/iconv/gconv_trans.c @@ -150,7 +150,7 @@ __gconv_transliterate (struct __gconv_step *step, /* Nothing found, continue searching. */ } - else if (cnt > 0) + else if (cnt > 0 && winbuf + cnt == winbufend) /* This means that the input buffer contents matches a prefix of an entry. Since we cannot match it unless we get more input, we will tell the caller about it. */