From owner-p4-projects@FreeBSD.ORG  Mon Feb  1 15:57:38 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 543F0106568D; Mon,  1 Feb 2010 15:57:38 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 18FA5106566B
	for <perforce@FreeBSD.org>; Mon,  1 Feb 2010 15:57:38 +0000 (UTC)
	(envelope-from jona@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0556F8FC14
	for <perforce@FreeBSD.org>; Mon,  1 Feb 2010 15:57:38 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o11FvbO7076129
	for <perforce@FreeBSD.org>; Mon, 1 Feb 2010 15:57:37 GMT
	(envelope-from jona@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o11Fvba1076127
	for perforce@freebsd.org; Mon, 1 Feb 2010 15:57:37 GMT
	(envelope-from jona@FreeBSD.org)
Date: Mon, 1 Feb 2010 15:57:37 GMT
Message-Id: <201002011557.o11Fvba1076127@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jona@FreeBSD.org using -f
From: Jonathan Anderson <jona@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 174096 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Feb 2010 15:57:38 -0000

http://p4web.freebsd.org/chv.cgi?CH=174096

Change 174096 by jona@jona-belle-freebsd8 on 2010/02/01 15:57:23

	Ensure that the argument to add_libdir_paths() is not NULL

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#33 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#33 (text+ko) ====

@@ -2126,6 +2126,9 @@
 static void
 add_libdir_paths(const char *path) {
 
+    if (path == NULL)
+	return;
+
     char *pathcopy, *dirname, *tokcontext;
     int pathlen = strnlen(path, PATH_MAX);