From nobody Sun Apr 20 18:29:50 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZgcVR1NN4z5tSnQ; Sun, 20 Apr 2025 18:29:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZgcVR0RPrz42Bn; Sun, 20 Apr 2025 18:29:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745173791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SHAiI3gn/QgaiBuaiGXOsR5gcGNxjJDhZQxhOpSnZV8=; b=oDNg2LJoImMYjIzbs3Y6Vbzx/CzCTSICtL62ViigQ0Q6T0T+nSYpoEfB8XNIvEBLl8lYJi 2EhEP0iGdcnm0dFzfkuD7+aOUDke5wfjEdT1tcxky8TPvyEVc89JuNWtTUz4Aylpv8ilB2 VK7y78siZ0JZe1ZQ99ntQqbzLnTGiTZKDxt0j1XW+hr6QxlYarE6M+1KBm1hlKKvoVsZGm NqiS/6TsAftBhuyOYySApYQv7fjDLWjXUB024YQOJrDrR43Y03WpGnIM4/qzmtj68yXsps NGETvmBJgPdD3bte75meFpQ6i3SwCGqI91xn3JPOqMrBpUz8Jo8d+rgZHwwiCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745173791; a=rsa-sha256; cv=none; b=qVyAEmn6HAzlcmdNKd+gt/ZTnsRJRjKiXa7rRcM5ROHRMaJQZGwvil7kceZZmN6K4nK+5y R81WEL5W0ozQf7oT+th9wcUuGPrLKanzDtofSaTk6rgbHoX+MSJo+kvmZot2Psn8CtdVRL SyeiW+q7jsaN8jm6yQwUwXdbhSkJZhQR4x5L18i/0HC2swgdT4YPUdBlPHMINI0IJdp3UC Ek1m78nHpJYAkZtUPJbbPjAn+O4RqCdy3gcgM8jtd0sDb/IY5YBv7ETKZTWN6Ws8KCvlGr mejE6DOi5KC8Fw1GiYCEduZQFeAxISIMLRO4eRT8ktQj3zyEVEgH9WS5yYqH9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745173791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SHAiI3gn/QgaiBuaiGXOsR5gcGNxjJDhZQxhOpSnZV8=; b=g0YbR+LRHP3bjdJvcaOOGN8sw43KCnbXsIC8vyF/5/9HZbaKMl5tqtyCYhytJfbSuSWIOI 5fJvVkmRgTnuzwNs0LKpudf7lbVyrVwaqWps33XRE6wc2tDsA06fXn3t0rb7FHpnjWgWyB Dlb96PVRwnMu/AGQx5Tm1dEIZ0x+NbaxgsSGVTCCDiHNXFQt4BVQxJQU/mk048Uea0pME2 +bUMocewPT40XLavYV5VX/bOxerIkaJ6BmfJ7gB5TT5IsqF/T8+zPU2ooQ/gLEXnYGjh3m N0D2gkqGanC24Ac61v1CU7E4Cn4KR/CI5f5aZ4DZ8/b3Eo0cHRlxZIFJtfa2/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZgcVR02ywz1FC; Sun, 20 Apr 2025 18:29:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53KITo2A012969; Sun, 20 Apr 2025 18:29:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53KITodP012966; Sun, 20 Apr 2025 18:29:50 GMT (envelope-from git) Date: Sun, 20 Apr 2025 18:29:50 GMT Message-Id: <202504201829.53KITodP012966@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: c4c562eadf3b - main - libc: locale: fix EUC shift check List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c4c562eadf3b790fa221e220d6a442f0cb84ca35 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=c4c562eadf3b790fa221e220d6a442f0cb84ca35 commit c4c562eadf3b790fa221e220d6a442f0cb84ca35 Author: Kyle Evans AuthorDate: 2025-04-20 18:29:45 +0000 Commit: Kyle Evans CommitDate: 2025-04-20 18:29:45 +0000 libc: locale: fix EUC shift check wchar_t is unsigned on ARM platforms, and signed pretty much everywhere else. On signed platforms, `nm` ends up with bogus upper bits set if we did in-fact have a valid CS2 or CS3 (MSB set). Mask just the low byte to avoid sign bit garbage. Bare basic test of converting a CS2 widechar in eucCN, which would previously kick back an EILSEQ. Reviewed by: bapt, rew Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D43262 --- lib/libc/locale/euc.c | 2 +- lib/libc/tests/locale/wctomb_test.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/libc/locale/euc.c b/lib/libc/locale/euc.c index c54a6ceceff2..c110fc61b375 100644 --- a/lib/libc/locale/euc.c +++ b/lib/libc/locale/euc.c @@ -426,7 +426,7 @@ _EUC_wcrtomb_impl(char * __restrict s, wchar_t wc, /* This first check excludes CS1, which is implicitly valid. */ if ((wc < 0xa100) || (wc > 0xffff)) { /* Check for valid CS2 or CS3 */ - nm = (wc >> ((len - 1) * 8)); + nm = (wc >> ((len - 1) * 8)) & 0xff; if (nm == cs2) { if (len != cs2width) { errno = EILSEQ; diff --git a/lib/libc/tests/locale/wctomb_test.c b/lib/libc/tests/locale/wctomb_test.c index 1e142ed74c48..ef2a6dcbe1e3 100644 --- a/lib/libc/tests/locale/wctomb_test.c +++ b/lib/libc/tests/locale/wctomb_test.c @@ -41,6 +41,18 @@ #include +ATF_TC_WITHOUT_HEAD(euccs1_test); +ATF_TC_BODY(euccs1_test, tc) +{ + wchar_t wc = 0x8e000000; + char buf[MB_LEN_MAX]; + + ATF_REQUIRE(strcmp(setlocale(LC_CTYPE, "zh_CN.eucCN"), + "zh_CN.eucCN") == 0); + + ATF_REQUIRE(wctomb(&buf[0], wc) == 4); +} + ATF_TC_WITHOUT_HEAD(wctomb_test); ATF_TC_BODY(wctomb_test, tc) { @@ -104,6 +116,7 @@ ATF_TC_BODY(wctomb_test, tc) ATF_TP_ADD_TCS(tp) { + ATF_TP_ADD_TC(tp, euccs1_test); ATF_TP_ADD_TC(tp, wctomb_test); return (atf_no_error());