From nobody Sat Apr 26 03:21:18 2025 X-Original-To: dev-commits-src-all@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 4Zkw3M3429z5tXnN; Sat, 26 Apr 2025 03:21:19 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zkw3M0xdHz3L4r; Sat, 26 Apr 2025 03:21:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745637679; 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=YSy8Htmf8FdSYR5Exqr+WYaA471GQwqU60AsHgPIQS0=; b=FUDHLP6B3/g+3TtHsBJZbdcxCvUnwxUY9vTUvEXDIEGgyr2EvF9y5CPZ4faSZppFRmNTKk CARZsje5zIkqPP7zG3vF2DrhkVOoPLda8Ua+AqemGEHw/nYm6LS40Mc8YiCe0UX5xZO4MS RRArK8F+8zMDOkzSuDUbMIXig+zgHWRo8x+iURdsMewafzIFZ34HfH1+kUFgNDuXl3uqA4 eKAUsuEodeLgLSBlN50XpJ70PHLc8YuLtgT95affcmHVQ+ah5rlKhYNmg3pmb09JJ1AcM4 MJLWUZ2dmkt+Y2j5WM2jT4RkVZnzectUhFPlRo/bsjDjIvYBO4L4yFZmPiLBVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745637679; a=rsa-sha256; cv=none; b=U0x0q+Oy9mp7l6/EwrUEDb6xsEkMmgmvqHpVEjKOejVE3nyT49ksNsqmIHuUp8aaI+5g+f Dg6sdSufF3ELIIlu1WivR2iA8b9FS46D7n860sQmKvi6sT5/v4kBp5Rurqi1ZzV0zmGw9G KHncuJMMEU8uSOFlJ8bQ2l30IkNtyqyiFTZeS6W4k38URlISmhLd8Seh/VDdiUGWQux1iW 9S5S/EBR4qsekLWaJLuaFNFmQ4DIqfBYVEHAbhaoCQRGHnn5mQH2efZ0q69KsCFQplceRI qCsH2brhhFOEEQzLGHopmKvZKcQHN9xqNrx1KDzDjWkan2fVxgzsG4v/YFCOiw== 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=1745637679; 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=YSy8Htmf8FdSYR5Exqr+WYaA471GQwqU60AsHgPIQS0=; b=c5Acvi7K0uCpPQMsF/KSFm/zGvS5P2nN//GP4khyyWEmLy7eACJnhHQ19akrAYcE81xHhr iFU1daB0Cj99G6lfbQYvq7rkUycYzg8PV+Q0bNdh3GoO5fIGngvsjk4xZXHADYKRwLgbKl MlyGZPQNaIbq7w1M03pMoYhDq1CXgD1OPW/GohIz37RYZey1Qk+MIirifhUriET9mqRGKh HeI4TzOTUhQ+1HHSHp7s4q0jJONJxCfwrrteWlE2zWVKD9t6yc5LjKnXYogzRqMcFG6F+D 3XWKxTN/nAXFprRwOvL437zRh13++XuTwDpMV58Gu7H0glBR+IVgzHJV5yNZXQ== 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 4Zkw3M0Ffdz12c5; Sat, 26 Apr 2025 03:21:19 +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 53Q3LI1k009792; Sat, 26 Apr 2025 03:21:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53Q3LIVE009789; Sat, 26 Apr 2025 03:21:18 GMT (envelope-from git) Date: Sat, 26 Apr 2025 03:21:18 GMT Message-Id: <202504260321.53Q3LIVE009789@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 25512b1fca07 - stable/14 - libc: locale: fix EUC shift check List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 25512b1fca07fdab3b747fb4ee31f9b1edb32aef Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=25512b1fca07fdab3b747fb4ee31f9b1edb32aef commit 25512b1fca07fdab3b747fb4ee31f9b1edb32aef Author: Kyle Evans AuthorDate: 2025-04-20 18:29:45 +0000 Commit: Kyle Evans CommitDate: 2025-04-26 03:19:49 +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. (cherry picked from commit c4c562eadf3b790fa221e220d6a442f0cb84ca35) --- 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 823928ff745b..dcd87cf7da38 100644 --- a/lib/libc/locale/euc.c +++ b/lib/libc/locale/euc.c @@ -429,7 +429,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());