From nobody Fri Sep 19 19:43:56 2025 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 4cT2xm2mCWz67VD5; Fri, 19 Sep 2025 19:43:56 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cT2xm2Blnz3Mxv; Fri, 19 Sep 2025 19:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758311036; 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=qGuY9J28AbcYh/dqOwFAwN6lRgO1EDdrO0a9u/IX14g=; b=OmiQC7o+1xu3NmSn06FXBC4j9ZKHzaNCJjQv8Z3ZaGXSXRJcfixcnzXmkpTonAIJLWI9KZ rwBszircdqn/Bs6p4bQ5yZwi4zpDaAOV3Bh9iaV559R1sTGb6W0Ou1HGltofgn2a197Hf/ LcD5IGb5yhd5e9mPNt9BZweMxelxLpK5lfKbBltMBPNsjGv+AVNggTFvyKM9aDpb+xCv39 gAmBzxNg76ucK074sP/Om36wKQy/T355m+X31Ucch7MlA89fdzmJbDLSc/3L6rauZh8V6L uC54aEV9/NiDe2A1fQZDBI2QeDUHrWvKSMQedhgVkL1DkSYHWBBcdZZ1WPHviA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758311036; 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=qGuY9J28AbcYh/dqOwFAwN6lRgO1EDdrO0a9u/IX14g=; b=S/3Yyq6xx1SHTqu9C6KAiFTMmPGPA/9mabA6/Csfv4T34zrHKxGhTaH+RhwDUyVtLHDxXi Zh2+r33Xh/rYIi4O6+qTQHaQFGT/itIyyKqfE4Tlpn0x4BNLSLIzMuTpdfpfyEDB8bX61k 833qsvw2Czzrupe8b2kXOA99GF7lWsua2je5rcBuWt7f0w1CLL+LsaJ+9CDFlCYlUHYS55 WfNT1scJiny1ktyEKpepiEHWIBVgrk+SeYNrd7SvmCeQr/0sdzZGFcQirXAMd/nDtXWpnx t5UNKnDShwE7JkXavM+s/JZElVsS6Flyb/TqSQJDj5HPu0GsOiUSiPdEsqm5Ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758311036; a=rsa-sha256; cv=none; b=M9MAq9Crfn/1kuj8/R4swCmCRegSrvZtvof59n1qq9XW1E7hWLzKSG2zsEaY56nBtAcE4o dygTFo8xl9lGbu/p2TGBa3KiK6/9i239NZFaOtb4Y9apwkHmUAxCGnYItT0+QrJO/Vn0CH tN6nepi1wmS40Y3rmkFL34RkT6H6mdMjgbf9pNpOtJ8ppC581trFN3+fV1TvGkX6N81FMm 5OWhHmhcZGxixPc+8mDyC2FIK/I7pR0hGPlmKRQ3dbXXxp0BzYYYlqtq1rGlmmsEjspDzU xAvGnjW8su97sR6BP8nDn+26T7uTZy2qp3oO0pC+m6B3UMUm9/hXLkExrDgf2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cT2xm1ZQxz19mn; Fri, 19 Sep 2025 19:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58JJhuvj051866; Fri, 19 Sep 2025 19:43:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58JJhulP051863; Fri, 19 Sep 2025 19:43:56 GMT (envelope-from git) Date: Fri, 19 Sep 2025 19:43:56 GMT Message-Id: <202509191943.58JJhulP051863@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 27331c63bc80 - stable/15 - sockstat: fix the -j option with piped output after libxo integration 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 27331c63bc806eaec70b34f81bcb4caac8a0e0f4 Auto-Submitted: auto-generated The branch stable/15 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=27331c63bc806eaec70b34f81bcb4caac8a0e0f4 commit 27331c63bc806eaec70b34f81bcb4caac8a0e0f4 Author: Alan Somers AuthorDate: 2025-09-09 16:29:34 +0000 Commit: Alan Somers CommitDate: 2025-09-19 19:41:17 +0000 sockstat: fix the -j option with piped output after libxo integration The legacy code handling -j in display() was causing xo_finish() to be skipped. It has also been causing a memory leak since 0726c6574f8 (sockstat: Add automatic column sizing and remove -w option) Fixes: 7b35b4d1963 (sockstat: add libxo support) Reported by: glebius Reviewed by: glebius Sponsored by: ConnectWise Pull Request: https://github.com/freebsd/freebsd-src/pull/1842 (cherry picked from commit 9bfbc6826f72eb385bf52f4cde8080bccf7e3ebd) --- usr.bin/sockstat/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.bin/sockstat/main.c b/usr.bin/sockstat/main.c index b5e0248b743a..2e75e4966d80 100644 --- a/usr.bin/sockstat/main.c +++ b/usr.bin/sockstat/main.c @@ -1612,7 +1612,7 @@ display(void) } } if (opt_j >= 0) - return; + goto out; SLIST_FOREACH(s, &nosocks, socket_list) { if (!check_ports(s)) continue; @@ -1637,6 +1637,7 @@ display(void) display_sock(s, &cw, buf, bufsize); xo_close_instance("socket"); } +out: xo_close_list("socket"); xo_close_container("sockstat"); if (xo_finish() < 0)