From owner-svn-src-stable-10@freebsd.org  Mon Sep 12 17:05:43 2016
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@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 A3AD8BD87DB;
 Mon, 12 Sep 2016 17:05:43 +0000 (UTC) (envelope-from gnn@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 6F4D7CEB;
 Mon, 12 Sep 2016 17:05:43 +0000 (UTC) (envelope-from gnn@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8CH5gpR013165;
 Mon, 12 Sep 2016 17:05:42 GMT (envelope-from gnn@FreeBSD.org)
Received: (from gnn@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8CH5geS013164;
 Mon, 12 Sep 2016 17:05:42 GMT (envelope-from gnn@FreeBSD.org)
Message-Id: <201609121705.u8CH5geS013164@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gnn set sender to gnn@FreeBSD.org
 using -f
From: "George V. Neville-Neil" <gnn@FreeBSD.org>
Date: Mon, 12 Sep 2016 17:05:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r305748 - stable/10/cddl/lib/libdtrace
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Sep 2016 17:05:43 -0000

Author: gnn
Date: Mon Sep 12 17:05:42 2016
New Revision: 305748
URL: https://svnweb.freebsd.org/changeset/base/305748

Log:
  MFC: 304825
  Unlike Solaris, in FreeBSD p_args can be 0 so check for that
  instead of walking down to ar_args blindly.
  
  Reported by:	Amanda Strnad
  Reviewed by:	markj, jhb
  Sponsored by:	DARPA, AFRL

Modified:
  stable/10/cddl/lib/libdtrace/psinfo.d
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/cddl/lib/libdtrace/psinfo.d
==============================================================================
--- stable/10/cddl/lib/libdtrace/psinfo.d	Mon Sep 12 17:02:22 2016	(r305747)
+++ stable/10/cddl/lib/libdtrace/psinfo.d	Mon Sep 12 17:05:42 2016	(r305748)
@@ -57,7 +57,7 @@ translator psinfo_t < struct proc *T > {
 	pr_gid = T->p_ucred->cr_rgid;
 	pr_egid = T->p_ucred->cr_groups[0];
 	pr_addr = 0;
-	pr_psargs = (T->p_args->ar_args == 0) ? "" :
+	pr_psargs = (T->p_args == 0) ? "" :
 	    memstr(T->p_args->ar_args, ' ', T->p_args->ar_length);
 	pr_arglen = T->p_args->ar_length;
 	pr_jailid = T->p_ucred->cr_prison->pr_id;