From nobody Mon Jan 12 17:19:45 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 4dqfJL2m2Yz6NrQ8 for ; Mon, 12 Jan 2026 17:19:46 +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 4dqfJK5Q1Yz42ZY for ; Mon, 12 Jan 2026 17:19:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768238385; 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=RmEkDSXDGlWjizk79Uv4/7ft3dfXDlh1t691hP+T0ak=; b=oK2lReoBk2DQx+zkxzt0uQ0I/7mi+nMR11D5Pp3BF+BYsbp8OY9vTPfFXQzcw72X/UKorL PeYtpAYxt6Nl8dQOk360Skk7KqRUlXOCzUQ3CwFWEet5am+AYqwd83MTn/bQX4uTa91TPg zJoX1fO1oyGgcGC2XcQUESoEjwCSLDc/OIYzjr8gkjkz9MaZC+Tcb6KMuWM2238EaJTotN QjKRhqCG4e5d0IalTJ2ZBESupbymk1BR+FtdmYcEQp+dXXb+lxeFWgLSxcmJuAxv/5jffS ZUpccdD2VQns9c3ZoBZku/YN44XMQpF4TOKNscr4x7GqDU9lLYResahZVhE/yA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768238385; 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=RmEkDSXDGlWjizk79Uv4/7ft3dfXDlh1t691hP+T0ak=; b=Z3JRx0KMc5g9/dN8vA1E/lhAnuhajGyCrO8xwHNDzaqpoGOXenZZeo5EX0B39KsClRGRKb wDsaec6hCsVjiyoigTmK/DcsGrVqxWGofh+zUDe12746aJaD4WwrljlIP+YYjvkOs0K/S9 EyAJgus06VgLhEUQwbAnHC0wxowOnplB0i1MddzArlFCNsQ67RjT5hv7mpL3+aNF3/PoF4 9LuR1U0GIvLlP5+hHZUIE+07ba3ZI0QaqYWLwg9Nr54gWmMSbe2mpH+cbQzNSjVGghjHG3 Lm2115ObZAm01GBbfFsCQtNBNuNeJmGiRoTPJUD3LWqO5I1D7gg5mFj7/Dq4Rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768238385; a=rsa-sha256; cv=none; b=PUXyvfanykZirL7tjfijqbBTZD+A3psuq/bX1uRjJT2ttEPUTzMVRo54xntAVNrgtbvJ4X AtW6j8yQYV6wxTaBADgwkylwqjtUgZ9bkc9c3VXmCwyuuTHHt8Lv8oLbP0YN5Jyq3KqtZA XBTkI/q4M1BQRDKmt184WpkvEsSO6ij5RpRAQa3FcBxh8uE/4FfxROVqnqYyKsv532WRba XSgpmoaYyuuPn1gO17MUBFkGzoc0FcJgklLLEmCpeDuk7ZWgnJPfY0/nvL4I3whwThzHRd 5KgKHhlLfGH08q/tYOUBPrqTl85Ud+bVRWB9HRkTW76tX15RWdT6vjdn07i/2Q== 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 4dqfJK4kHkzcLQ for ; Mon, 12 Jan 2026 17:19:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36842 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 12 Jan 2026 17:19:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 61b429198db7 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 61b429198db7af6451ffdeeec95e65562b45f575 Auto-Submitted: auto-generated Date: Mon, 12 Jan 2026 17:19:45 +0000 Message-Id: <69652d31.36842.40c3c1a5@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=61b429198db7af6451ffdeeec95e65562b45f575 commit 61b429198db7af6451ffdeeec95e65562b45f575 Author: Dag-Erling Smørgrav AuthorDate: 2026-01-03 20:34:44 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-01-11 02:30:47 +0000 libgeom: Fix 32-bit gcc build MFC after: 1 week Fixes: 27894e20f140 ("libgeom: Fix segfault in 32-on-64 case") (cherry picked from commit 17355cf50fcbd0d8ddb638e1f2fd5861b526edbe) --- 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) {