From nobody Mon Jan 12 17:19:32 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 4dqfJ523Lwz6NrbZ for ; Mon, 12 Jan 2026 17:19:33 +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 4dqfJ50RYnz428Y for ; Mon, 12 Jan 2026 17:19:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768238373; 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=vS+v6sQwQo039e+XTpAzALz8d577u4+WwCV37vKVpug=; b=KbC2odS3eRmUReVjqmANRTcyF+ilvNxb3rP8X3NygkriWkxNuFDf+zYwJh7j9+3xJTWkgH UY0olV8aOTc3mJBo/qOaSUcT9HROnTQuMw2e0cT6kzFNzU8fDKRJSv7o63m650oVo5II0k mx6nmYC6wTDXIEqtb3G+vU/W1ifTbxUt9HyYEF/wDvVir5NQEmC8xu91Jw5YEs9Q10UkZY Q8uMw3EWpDL6CmV4STmT0ebUn8VAbh/YVvUpQb+5LS2SyITP6YMoX6l18CoUHqnypi8j58 ZZ0FUJAoa0wA/i6zgpWelt9WIX3lGX8h3h9B7TmvuV/Z96jmFalIhjegd73+KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768238373; 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=vS+v6sQwQo039e+XTpAzALz8d577u4+WwCV37vKVpug=; b=gETLzAdkC3uQSmFP4yTVsxJSNcYoFohTejI0BhNVriJV1q2IBLoIYGVj8Lcz/NuCM7Pxlq nPxtvUtIjtjUuXWwtT/uDLSLpM5uqBMCSmRrgkymlrGgB418KBrZfsp8QnFyIqI9xkfy6S YmI3iTEBlg1JWmQ4/0ZWd2uBl38DRXnezxUi8/d0P2xp5O0OIfodKZZoOxT/tEdkO3SdOF 1MoC633iZZqimcIwdU13znumXYSBhn+U09iDkOIEnwzGMrG0Zx9DX6hY4742LF803NOETS HdTMuhT/seZ9EdyKxRaJBK+tFihfjgYbeFrZx2jAClPoAVx90Ke1wHzb72YG8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768238373; a=rsa-sha256; cv=none; b=yHHM9kML/MVeAX06TQklQEUQoJC0SK7c7Zq1KUEj0erh3qfJQ7lW0biKK+6nSm2IpyIYHW 77rjAtnr5JqMtcsnuaoXrDPdq92yiKVvxvfJRnjUb/OoxtGY4x0zzbaPh5HTwFUWaflZgk CSfBSOJsAaX37bBgYgygXvRoSMxS+us/HDpoZffrFqVwH3arBwW43tSv3cAXbNADXJnbCD QTNEF4BhciJpzihQjl8Br+8SvCYoQnFdvaE6hl/YYWcWGGOMAUJL4RhFn1bYgE1KeZblHv 0c2C6/otIT3WZKwpZZ2VGvkaQmwgI1lFajS+Z6k9CLKkWfTpmi8Hm/gHNwOCqQ== 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 4dqfJ473nxzcBM for ; Mon, 12 Jan 2026 17:19:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3808e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 12 Jan 2026 17:19:32 +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: 618cf02ffc52 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 618cf02ffc529da1bb76622386bb7cc0eeb0a823 Auto-Submitted: auto-generated Date: Mon, 12 Jan 2026 17:19:32 +0000 Message-Id: <69652d24.3808e.6c96c572@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=618cf02ffc529da1bb76622386bb7cc0eeb0a823 commit 618cf02ffc529da1bb76622386bb7cc0eeb0a823 Author: Dag-Erling Smørgrav AuthorDate: 2026-01-03 20:34:44 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-01-11 02:30:31 +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) {