From nobody Mon Jan 12 17:18:47 2026 X-Original-To: dev-commits-src-branches@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 4dqfHD3qfMz6NrY2 for ; Mon, 12 Jan 2026 17:18:48 +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 4dqfHD038fz40g8 for ; Mon, 12 Jan 2026 17:18:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768238328; 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=6VwPpfqNUVEQP4ftATjSYgbqAEew1A4949G75pmzSW4=; b=aoE3dlz195Xs9yv/BN3MUHKc3NqRHEBdsQcYYMDV3e1cx+xDl7OoZbSzD1qazknPWvhm1g iFOncTpPvFZ9oW1VTpC9DwWUT7HKb8sZfs8iWvMhaB6Pvmr7r+1fNudlgt1RyK365zgVmK QB/HU0dRw5rSes7QeLqhfC0+Kh2NnjSlJVDOnPNflGNzEbxKJVNjOjEJ/KEqUgjXfRNnI1 xpiRDNI6fIV4dFqde+CrmIaMuqxDA393DESm6dIVyJEkR6aj5j/d8/p3lq/BUWodhP4Nh8 N/4U+9UNdgqO5POlSsDlI7bxVnFONzMNVWMCnBgaClnIsWYiesyReL/8teiI+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768238328; 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=6VwPpfqNUVEQP4ftATjSYgbqAEew1A4949G75pmzSW4=; b=x3HSiUuLztiPldvZpAvL+D+yXms9GH327Fl8TnPVsucN/5aTD71t4YCGB/wf4GIUZt7L59 gOkMVuObf350/UitJ3pVW9auBJa5BAYSX7JayUAGSq+LYjDwnWsPAMUivCjSDlj16v/blt 4C6sc/j21IbzNZ18zBPUNqJoOqrTvwkLdN8mjnboAyK5bgsoAE5npi3RFNLdoHiHwefiZl 6Ttuu7GBqq4vdkEVqEEasqi5Ked6ncnT1eLQY1jlqa2PhrP+Trwpi5tUPMpdy4kjSYjkhq GcALCvoAj/ow40IMD0YHg6H0DF6ebH+TOx/X7b1QEZ+LY7g/rzdwnvAxQlKitw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768238328; a=rsa-sha256; cv=none; b=l9hI512jb/oO6yjfQyAkZofIwdcLRjGAjdgzpZcqxxanKUcCLB6eVvK788LA0eCLqcYG3Z zxvZhi6o9virfMQvmOs0+2l8xThhWn57/WU4xpL5Qm4eAv6lKRgCHSC7IzHXpZf/VD4Wr/ ei9BuEcudDUIuYd6xh/1IN+TUL+F3i07wGo9U/N9jFSv2i/qVh+Ov8KosOtDj9ofcDKRL0 1yaNtItRVba2SerCw3k+fPn+QJHEI7YyP8dXd1EbCT1l38oOZ914DDlTjNoG9K6hhdRTE5 bXl9AzpaBPV5uTiKcapQpJxdtbQGNC3bd5I9aVTFe1ZcjRz2opQBIExh/WkTcg== 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 4dqfHC6hn4zc0X for ; Mon, 12 Jan 2026 17:18:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37fb6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 12 Jan 2026 17:18:47 +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: e25aedb85e9d - stable/15 - libgeom: Fix 32-bit gcc build List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/15 X-Git-Reftype: branch X-Git-Commit: e25aedb85e9d0d2da73e9efd4fbe3adbaa7812dd Auto-Submitted: auto-generated Date: Mon, 12 Jan 2026 17:18:47 +0000 Message-Id: <69652cf7.37fb6.8b326f3@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=e25aedb85e9d0d2da73e9efd4fbe3adbaa7812dd commit e25aedb85e9d0d2da73e9efd4fbe3adbaa7812dd Author: Dag-Erling Smørgrav AuthorDate: 2026-01-03 20:34:44 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-01-12 17:18:22 +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) {