From nobody Sat Jan 3 20:37:34 2026 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 4dkC6k5tKKz6Mnv0 for ; Sat, 03 Jan 2026 20:37:34 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkC6k3sYKz3fJ8 for ; Sat, 03 Jan 2026 20:37:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767472654; 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=b1lo1mQoVAjUqpQl4IMtR2rROXwc3QIeQlwFem74B2Y=; b=q13VdmDzLycbPsmGqeMbr8eWMGWORU1tzcjmkB+Ot3bxOaR5rBLms/YOObAau5Ivda8tP8 G1x+tbJjlCwEPBBU5YvsieBQa0HkuVx6XXGCzwunJrrzmT8ATWAz8ZAGofznvIOhotGq/O YBs5GCFCWXtvJo8P1kgfSHW4JX8qbCObJtIdGz0jNfb3m2zwTx2qbOml8xFvZAOSfmViHK 2DWzNPQP7j35a0vlAL5ZI/++nCK68atKHzxcXB2DjoSf5nelgr177+r9vn7HveBbH58lkq tNmkxTgoK6AWZh96xmZB8IM6anvGzSnFDaGVvEoQQO3qOxDMhrP7qX5PRtdUrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767472654; 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=b1lo1mQoVAjUqpQl4IMtR2rROXwc3QIeQlwFem74B2Y=; b=iPzRip3HyRJFXkZGZkDk+/xaxE53c53lw7Jb6ahyAKD30hdaC1YjpPcyShc2UY7mat2T+M vhf8s6Cn0UFLi6B6CLcyPnOyxf/SPLRQAtU8cW7okZx98kwEnb+RVZ60dxnnJZopjwCpPw uW42A6OhX70VCdrVwH71TGielYWOWfY9rcbIwWjCX79AIdtruunKp0uo3hRedpbpJOGlkI w/VqbdiLdN3minsJwQTdrgI9bWwpKx9OJ14ftksWJ/pC5/4ehoyRsyxXN05Z33kabuAeX/ Le/1BC67N+e5UyYEbvCjPbH7njTkCSnu/Bc/wGUOHeMtPqCYUPxSPfOp2CPb0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767472654; a=rsa-sha256; cv=none; b=DH+gx8h687vTTkJe4VCyoUG8Mo/RLG7MGOWye3KCvsGWwOi5hdma+V0EXkkRyT4PIzlanh ALBK5IA/py8jW2XXPk3rcBm1wu3yD38KL9HWlAXQU90qGvKLn2EkMD7dSecuuelWxvHPLu Jvnp6veVCrxE0jBu9CtCFe35+MKxf3orhLjH3e3ZGH7jprqeWr13yzfxehI5hyp56HmPV+ +Yijj7iEHorKZ6fWyme4DPBevzFmKM0EsvXOw67l9lPDYQfwhvxnFuOIB26on9A3G+kEmT gvC/HZvSf9NzoSXilGffI7rw91KUa1PU/4MIow92o1YhIaAoHqt8ZNitlVtlzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkC6k2yFwz1JbT for ; Sat, 03 Jan 2026 20:37:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f9a2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Jan 2026 20:37:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 17355cf50fcb - main - libgeom: Fix 32-bit gcc build 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 17355cf50fcbd0d8ddb638e1f2fd5861b526edbe Auto-Submitted: auto-generated Date: Sat, 03 Jan 2026 20:37:34 +0000 Message-Id: <69597e0e.3f9a2.3d060960@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=17355cf50fcbd0d8ddb638e1f2fd5861b526edbe commit 17355cf50fcbd0d8ddb638e1f2fd5861b526edbe Author: Dag-Erling Smørgrav AuthorDate: 2026-01-03 20:34:44 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-01-03 20:37:18 +0000 libgeom: Fix 32-bit gcc build MFC after: 1 week Fixes: 27894e20f140 ("libgeom: Fix segfault in 32-on-64 case") --- lib/libgeom/geom_xml2tree.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c index 03210947d431..a66938671845 100644 --- a/lib/libgeom/geom_xml2tree.c +++ b/lib/libgeom/geom_xml2tree.c @@ -71,6 +71,7 @@ StartElement(void *userData, const char *name, const char **attr) struct mystate *mt; void *id; void *ref; + uintmax_t umax; int i; mt = userData; @@ -80,10 +81,12 @@ StartElement(void *userData, const char *name, const char **attr) ref = NULL; for (i = 0; attr[i] != NULL; i += 2) { if (strcmp(attr[i], "id") == 0) { - id = (void *)strtoumax(attr[i + 1], NULL, 0); + umax = strtoumax(attr[i + 1], NULL, 0); + id = (void *)(uintptr_t)umax; mt->nident++; } else if (strcmp(attr[i], "ref") == 0) { - ref = (void *)strtoumax(attr[i + 1], NULL, 0); + umax = strtoumax(attr[i + 1], NULL, 0); + ref = (void *)(uintptr_t)umax; } } if (strcmp(name, "class") == 0 && mt->class == NULL) {