From owner-svn-src-head@freebsd.org  Thu Nov 16 22:14:51 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 02608DEB3DF;
 Thu, 16 Nov 2017 22:14:51 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C2F1C6D47D;
 Thu, 16 Nov 2017 22:14:50 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAGMEnJI041229;
 Thu, 16 Nov 2017 22:14:49 GMT (envelope-from avg@FreeBSD.org)
Received: (from avg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAGMEn3P041228;
 Thu, 16 Nov 2017 22:14:49 GMT (envelope-from avg@FreeBSD.org)
Message-Id: <201711162214.vAGMEn3P041228@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org
 using -f
From: Andriy Gapon <avg@FreeBSD.org>
Date: Thu, 16 Nov 2017 22:14:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r325906 - head/usr.bin/procstat
X-SVN-Group: head
X-SVN-Commit-Author: avg
X-SVN-Commit-Paths: head/usr.bin/procstat
X-SVN-Commit-Revision: 325906
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Nov 2017 22:14:51 -0000

Author: avg
Date: Thu Nov 16 22:14:49 2017
New Revision: 325906
URL: https://svnweb.freebsd.org/changeset/base/325906

Log:
  procstat: fix a crash with -k -a options
  
  The traditional / legacy usage should still be supported.
  This fixes a regression in r324619 that introduced a nicer, verb based
  interface.
  
  Reviewed by:	brooks
  X-MFC with:	r324619

Modified:
  head/usr.bin/procstat/procstat.c

Modified: head/usr.bin/procstat/procstat.c
==============================================================================
--- head/usr.bin/procstat/procstat.c	Thu Nov 16 21:47:41 2017	(r325905)
+++ head/usr.bin/procstat/procstat.c	Thu Nov 16 22:14:49 2017	(r325906)
@@ -296,7 +296,7 @@ main(int argc, char *argv[])
 			cmd = getcmd("tsignals");
 			break;
 		case 'k':
-			if (cmd->cmd == procstat_kstack) {
+			if (cmd != NULL && cmd->cmd == procstat_kstack) {
 				if ((procstat_opts & PS_OPT_VERBOSE) != 0)
 					usage();
 				procstat_opts |= PS_OPT_VERBOSE;