From nobody Tue Sep 9 16:45:42 2025 X-Original-To: dev-commits-src-main@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 4cLqSk5Wjgz678nX; Tue, 09 Sep 2025 16:45:42 +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 4cLqSk4pJNz3L1p; Tue, 09 Sep 2025 16:45:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757436342; 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=8aHTS/sntm6z+hXg+hvn6zWkMTdlkGauno/hAXAcBsI=; b=sztNzO6L+QZG7DJaLZg6Ia/O9Qi1e9sXZLs2M8OKu5YwtREa4l0c63sNBDep2Eicz8MInI lG59GUiBFWQGCXJ6fqDHII/5jT9RQO99qUnONe2fquQ0DOd+qlgU8J7PCoUbtvQppJLMtS Yv2LcVpjnngNbQ82DFqzjqNO9JnbonguLIN9YG+GyfGk1xyfcChZnUWZCUZSgtjvLda9TV oAjFTPWEM5rAM8tJKFVq8IzOZR/LfZ0u8Yh0n0Tfwoaj203V/7aFPSC4xY/12WdLd5Cazd 4IXmFWd6b3IygIR7Ix3VOE6mpf2LqdsXZhYMhFnFMl1qa/4jGXw2bp6+w1jUAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757436342; 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=8aHTS/sntm6z+hXg+hvn6zWkMTdlkGauno/hAXAcBsI=; b=L3Y113HdNzICVSn+e8RQEhYNN1Sm6uAKm3Gympnal0A5K6h8WwVSDluIpe3Eh9EskzeRr4 Y8OEhWTteqcnY38mXokPbUXNEpxlf+0g3CcNYjM3WS3cdn40mLvkByCNAWqRu6OCjNxhO3 nNhlfrtnyQQOiIFVMOOaTMB+yFJEna9ZgPx2IL1THDgisGsvGJOM+76NkbLfC2O4xeGy9I PMxT1TslPYJ1VRiVoQhOzUvHmsv8fZgNwcBAoyiTKdBfpQJf5hHDWm7NG6bABZEpXSlyTw ta/NFeaWLC9RLZ9Jcyor7rXEI734OOH0uvkxTAoy4n8TE2GMA7XYKPA48IJ33g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757436342; a=rsa-sha256; cv=none; b=kdaA3ZVGX56CLNU0GhSl87VWAPjOmz9+DGxlENlgX2WpxvlZ5nOMRZmBR3fkYzs3k0QcHa eO7kzYLp2NAYSOCUmblwenDnzsE+poA3ONjqPLUcOoxmOiZVKVuMMNE28T3egjZMuatP8X 79Vg0ZoPxNdV2x0QpG4GVSKrTnbhSi6JyCBAx+a/revwv7Dx0UURNZZc6CHGu6RYacQbk3 xrgOVn6f8RISP0U74QYKlLvZLh4OSYfvmZPH3nDW27+o9mzdLPYODZmVNOxqBy5XR/l0aR MaE8Yrp493m6jG7bqBxSLAfSkqxzPS2qGoHVDVb7IixQbbseDJFrCPee59V2Fg== 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 4cLqSk47M4zkVw; Tue, 09 Sep 2025 16:45:42 +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 589Gjg2O033769; Tue, 9 Sep 2025 16:45:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 589Gjgkt033766; Tue, 9 Sep 2025 16:45:42 GMT (envelope-from git) Date: Tue, 9 Sep 2025 16:45:42 GMT Message-Id: <202509091645.589Gjgkt033766@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 9bfbc6826f72 - main - sockstat: fix the -j option with piped output after libxo integration List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 9bfbc6826f72eb385bf52f4cde8080bccf7e3ebd Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=9bfbc6826f72eb385bf52f4cde8080bccf7e3ebd commit 9bfbc6826f72eb385bf52f4cde8080bccf7e3ebd Author: Alan Somers AuthorDate: 2025-09-09 16:29:34 +0000 Commit: Alan Somers CommitDate: 2025-09-09 16:45: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) MFC after: 1 week Reported by: glebius Reviewed by: glebius Sponsored by: ConnectWise Pull Request: https://github.com/freebsd/freebsd-src/pull/1842 --- 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)