From nobody Fri Jun 20 16:40:41 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 4bP3BK73byz5yGFf; Fri, 20 Jun 2025 16:40:41 +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 4bP3BK3b0wz3dgw; Fri, 20 Jun 2025 16:40:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750437641; 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=1SgCp+C/hsfU6HNUJE8FqCpbF0nrCY6M8XFf2iClHkk=; b=dZsWsGfNt5zS2nuT95L2XoyB2Qik/QiTmT9M4B/juvxFTIJWCz4iRmgu+T9EeSN3K+xMT4 6aBSswRtpem4n+iZBB3WQB48tnUNptzuRgWY7a0IBP0TjifF1+0ucUNU4UVADLDkYWpnTF z2uE/qjIayLRTc/5yFyUYPlJPQ5RjLlpYIxg6YR7WnnmI4ppZjDTJ0f9Sci6/+YeitKFQ8 NKNhVNjEEosZd4IaqMs2M7SswJ1wGR4fupQ6jfaD7vlPBlfyr8cr+Eb8Fwtdmu0j0XGZnA T8rt7J5kNXWUsV0nMol3CIC49JFih+EE9mFpU0AZzvkKh5/5BHpaJ9/tSU5GSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750437641; 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=1SgCp+C/hsfU6HNUJE8FqCpbF0nrCY6M8XFf2iClHkk=; b=msVJ+0/ZwDN/BUcETkKKjqeigmmeONi0B7HIecjin5kHemdPN/MqbKgzakz4+Y3jCtPTFo DxY+Lio28KwR1m5Nsizw5Px4lRp3b/i5/1GWZk7u2cI5sj2miHRpsUc1Fq7lcoEPdx2YyB wTz00Fv3pgqOsiW6N12y88K5v5PaaIn8H0pEl2ISwBOLmZY4a9yrzexLdbm0uGFYDRjZ6m toxP6LLjWuKqKf2IWPD90oLYwM67+4KrKkgFN6uQ49d+haLL88ukHvdnbtMC9Dk1SuXXxj FPYncfWc+iFqKDJaJEqpogkHhzqo9cDs/2RXr4TxY0Bnkek6YojfKi09nIZWaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750437641; a=rsa-sha256; cv=none; b=sDyl8BwHl72138bZajBghgGzoK2fgpSIF8ChxBwKztNPzj11cBE8e7VH2Hrhjd2vtc49po hJ3qgOICqGAmisg8soI4J3NCbshqWGaTUwztHBW43Mqyph9G3Ra30qiln9ieOZc0SxO+v/ sR6ziMqs6A3bXQnad0mRL4kcJFoHRUIpwkLcBJvvX3W3l929gj1TQQs6pu1vONWke1Ie/k tfHdC2AvGSkT8AyJWWYO4/WLQ6nGKPY6cS+aXRa2AFxCW+HfC5so5rRnaaGVwx4DZvBPgM oi/IqAGYm/rsb65MY6/VFTQlR3GVi8KkAbKi9s45nHD0nf2gsANTt1HE7WX1jQ== 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 4bP3BK1ggjzsxp; Fri, 20 Jun 2025 16:40:41 +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 55KGefrR074706; Fri, 20 Jun 2025 16:40:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55KGefMK074703; Fri, 20 Jun 2025 16:40:41 GMT (envelope-from git) Date: Fri, 20 Jun 2025 16:40:41 GMT Message-Id: <202506201640.55KGefMK074703@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a37bc4cb8d2c - main - 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/main X-Git-Reftype: branch X-Git-Commit: a37bc4cb8d2c5c8402341c9df75580f60bb34186 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a37bc4cb8d2c5c8402341c9df75580f60bb34186 commit a37bc4cb8d2c5c8402341c9df75580f60bb34186 Author: Mark Johnston AuthorDate: 2025-06-20 16:10:57 +0000 Commit: Mark Johnston CommitDate: 2025-06-20 16:39:22 +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 --- 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 3dc70c7adf94..181d8ecd4840 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) {