From nobody Wed Jul 9 00:44:38 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 4bcK4R192fz60pBR; Wed, 09 Jul 2025 00:44:39 +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 4bcK4Q5hB0z4Hd4; Wed, 09 Jul 2025 00:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752021878; 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=qFhzRBV0iKRc5cejpkCRx72/+I9M7GC4W7oUKk31JeE=; b=nQCkSp2Vtbx0BTTu2S/0XPyNOntxrghWkpRm6vxU6IJevT3uSH1+ZkrnwlQBMV0EhdgPzH UYYbbkmkYJ1HR+Q4Z4yMGbS4UJkDiwe7PJESe+qtCtMwmaxov7vIL8/oIwvpAIFj7W0P6G AQNpnrjmS+H2V2XVvp8M9Waer79HTAUg9mU9tpOwJM6bK6nPBM2J1DJm/BTxl0uOv83zpq Y90kjW1ZUEvTKW6HAmcqSaJDOkoC9tD4dgy9pxT//Uc/cgMor9Wgev7QW9tE+bA54/Ziwx 8dSZzZf6ttzWDBAnPYX3rOOKEJo+2OWbql925oWRw7WgFV4VpcsP9lm2TmIsGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752021878; 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=qFhzRBV0iKRc5cejpkCRx72/+I9M7GC4W7oUKk31JeE=; b=yt/wuecZNcExO5BGH0pKEaLfcvWlFRe/Bvy7UDdoXAyfhG2F+Z9scUPaaliZ+zsSGcjgOb 775nugbqCIfJ52Z+MmvFgz86/7OjCOjsUSSgsZ8u+l6jHkhVOkVt4f0b1X80DShoLzC+uL wUvpWKCVc1wXnCpcWHveW86nuCDG2A7WIfOa59JWoqVyq2u4ESClndKjT4+WPaVqUV4OLX FxuBgAH1kfpALqqLNJQV4qqv4mbX6b46ahIBN5gHDQCsru/JzIdfC+pUJzze4mdL7MqPmR O/i8E9a3GCo8/fPNFsixEbN/FhgRRQHoduzUT5LGri/oUekDy6rrpU3VnQvZ/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752021878; a=rsa-sha256; cv=none; b=Ov4KFJ3cFhheTnH7MjfuWo3m9iD+9XoFhEmOK6ojK8rsTmkC2d9a/zOOSzJzwnbJGDiGND RQ0o19nudk1U9j2V8vxSh3Z9OLynDFFcYT+ZjxBeaaP4VC1D/odkZvlZ71lVed2GOsz090 d0yQZIUt+NqPXXshfwRMXRUQAnPzd2K22tSygcv/xyNnI0tzhfo/0OWn5PbiUOIpRzO2bj xA5k+RhGGQRbsYNnFqDFvxqpVureApWotv6NjzgEffWRyfuE6VXvjv16oeOwx90b2lezau 4e6qk/mDVdSnlffxQo/mcFMVW6BAmSIHQ+z/xX/lNxiS1FrwrsY2xA7kORqNTw== 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 4bcK4Q5D42z1097; Wed, 09 Jul 2025 00:44:38 +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 5690icZ0022467; Wed, 9 Jul 2025 00:44:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5690iciP022464; Wed, 9 Jul 2025 00:44:38 GMT (envelope-from git) Date: Wed, 9 Jul 2025 00:44:38 GMT Message-Id: <202507090044.5690iciP022464@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 10d14a37206e - stable/14 - localedef: Fix a wchar_t comparison 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 10d14a37206e77e050676c8fbd96600f9101cf8b Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=10d14a37206e77e050676c8fbd96600f9101cf8b commit 10d14a37206e77e050676c8fbd96600f9101cf8b Author: Mark Johnston AuthorDate: 2025-06-20 16:10:57 +0000 Commit: Mark Johnston CommitDate: 2025-07-09 00:42:52 +0000 localedef: Fix a wchar_t comparison The intent here is to characterize wide characters which fit in a single byte. When wchar_t is signed, this comparison is insufficient. On systems with signed wchar_t, of the files in /usr/share/locale this only affects zh_CN.GB18030/LC_COLLATE. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D50757 (cherry picked from commit a37bc4cb8d2c5c8402341c9df75580f60bb34186) --- usr.bin/localedef/collate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/localedef/collate.c b/usr.bin/localedef/collate.c index 2a080773a95e..da3f26b4d0ba 100644 --- a/usr.bin/localedef/collate.c +++ b/usr.bin/localedef/collate.c @@ -1273,7 +1273,7 @@ dump_collate(void) RB_FOREACH(cc, collchars, &collchars) { int undef = 0; /* we already gathered those */ - if (cc->wc <= UCHAR_MAX) + if ((uint32_t)cc->wc <= UCHAR_MAX) continue; for (j = 0; j < NUM_WT; j++) { if ((pri = get_weight(cc->ref[j], j)) < 0) {