From nobody Wed Jan 7 14:35:21 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 4dmVtx6FWkz6MwBg for ; Wed, 07 Jan 2026 14:35:21 +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 4dmVtx3Vg6z3f62 for ; Wed, 07 Jan 2026 14:35:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767796521; 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=BuSlnJoXsUffhSM6NFVRD/qRh7lQIAy9cPhRbTeXjbM=; b=pjsELTxSZmpYeY9P+N/Hc8sQ30iqm6WSYWVeuYjLgQYsogXbmjKhX5XvVpaqygfwncMtf2 wUtiIJmKoYG316vfd/4I6bJmAO3lbjJDZxCo5Nrg/ctoy4SHMFtLYAo8N0SWRj4pviwQBa bGNrlXI88GUUt4cKhdUUMAbdFcmb9bKyUpVYgRq6k+c5Qz2HbkCbDUuJM7IxLFffzVOE0g hEOUyqKqHHHZp42aOL30wGNlv5mparsZZ82GiwtuZkLpP0pehXer/PD3KVBwpadLfszZK6 hM8xsA5d+GfvNv7qCTTmWdNVdt4Fw0kX/vrXGXSrQY8XoHtOFHPzPmFvJUNLrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767796521; 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=BuSlnJoXsUffhSM6NFVRD/qRh7lQIAy9cPhRbTeXjbM=; b=HHYXB7SXOhEhzqA+Vo6pqsDjD1MIh4rfCbIFuNRIrlN1h8Z4BrnRrsUJ2j1d46UFZ+4f10 R/xX7SPjDoS91l6Eq4kqxeoW32ysxveC0VuF8cd4R6Qn3/nZIwChpPj2b6MENFg0XuZnLF ciiQMZ/N247UDHVODVXm/uDBo6O3mH7n2sdPIyfPcfP1OPs7xyz13X8Y99i+3bJzbVM9z1 XXnYnMsESjaeKSCj4UpO4Nb2/L7qQb6upPZaVTPV4S97VheYanLy0h7QL3yieqHoK8+07S CO2IXh02Te+Fj92rfismvgBxeX0DBGon4gXo5xB4WMaZuhyqNnEIUMxPJEanUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767796521; a=rsa-sha256; cv=none; b=sVPYZoOB/dXIHIea/U319OVCFWG/71rUfaEwV/hP+pBb+3EPMe42VzTpq9NL/hrpSCAWe5 QKSYFAk/QVcKEb1b/vH4icH0I9rKyektlpAylFa6FW4j6rJ26xXlnDO2iH+vXEoohNLwLT xlxFaOhd+xzslMjeoKABqFWMt5jPMhZvVSytQe8HvbMqG30NgcdhJBSNRer3Y5lgy1I5Uo Lqf0G6pexzA7no4VhRfAnxqsUzb9+vI525VL+RzdYk1XpDIyr2EdAqVFLsRTtNpUaZoMPP Amdbpo+qQ3DB8XeQKAE190dZT1d2mFBaYO+1ag+17YeGuXSko+AELhRKBQa2+Q== 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 4dmVtx34B0zx3y for ; Wed, 07 Jan 2026 14:35:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ade7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 07 Jan 2026 14:35:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 3b6615ec0332 - main - netstat: fix a segfault with --libxo 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b6615ec0332f901fcc9e9307f78717424f09c1e Auto-Submitted: auto-generated Date: Wed, 07 Jan 2026 14:35:21 +0000 Message-Id: <695e6f29.ade7.4cf71b8b@gitrepo.freebsd.org> The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=3b6615ec0332f901fcc9e9307f78717424f09c1e commit 3b6615ec0332f901fcc9e9307f78717424f09c1e Author: Alan Somers AuthorDate: 2026-01-06 22:19:57 +0000 Commit: Alan Somers CommitDate: 2026-01-07 14:35:13 +0000 netstat: fix a segfault with --libxo Fix a segfault when printing the "protocol" field. The field-format and encoding-format were expecting different numbers of arguments. Also, fix the width of the tcp-state field in encoded output. PR: 292228 Fixes: c2b08c13c20 netstat: add support for UDP-Lite endpoints MFC after: 1 week Sponsored by: ConnectWise Reviewed by: tuexen, js, des Differential Revision: https://reviews.freebsd.org/D54567 --- usr.bin/netstat/inet.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c index dee245b63a87..6e4811480237 100644 --- a/usr.bin/netstat/inet.c +++ b/usr.bin/netstat/inet.c @@ -394,11 +394,10 @@ protopr(u_long off, const char *name, int af1, int proto) if (istcp && (tp->t_flags & TF_TOE) != 0) xo_emit("{:protocol/%-3.3s%-6.6s/%s%s} ", "toe", vchar); else { - int len; + int l = max (2, 9 - strlen(name)); - len = max (2, 9 - strlen(name)); - xo_emit("{:protocol/%.7s%-*.*s/%s%s} ", name, len, len, - vchar); + xo_emit("{d:protocol/%.7s%-*.*s} ", name, l, l, vchar); + xo_emit("{e:protocol/%s%s}", name, vchar); } if (Lflag) { char buf1[33]; @@ -523,9 +522,9 @@ protopr(u_long off, const char *name, int af1, int proto) } if (istcp && !Lflag && !xflag && !Tflag && !Rflag) { if (tp->t_state < 0 || tp->t_state >= TCP_NSTATES) - xo_emit("{:tcp-state/%-11d}", tp->t_state); + xo_emit("{:tcp-state/%-11d/%d}", tp->t_state); else { - xo_emit("{:tcp-state/%-11s}", + xo_emit("{:tcp-state/%-11s/%s}", tcpstates[tp->t_state]); #if defined(TF_NEEDSYN) && defined(TF_NEEDFIN) /* Show T/TCP `hidden state' */