From owner-p4-projects@FreeBSD.ORG  Wed Feb 20 06:09:20 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6F7A316A407; Wed, 20 Feb 2008 06:09:20 +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 2B1DE16A401
	for <perforce@freebsd.org>; Wed, 20 Feb 2008 06:09:20 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0508013C4CC
	for <perforce@freebsd.org>; Wed, 20 Feb 2008 06:09:20 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1K69JHC087580
	for <perforce@freebsd.org>; Wed, 20 Feb 2008 06:09:19 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1K69IeX087577
	for perforce@freebsd.org; Wed, 20 Feb 2008 06:09:18 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 20 Feb 2008 06:09:18 GMT
Message-Id: <200802200609.m1K69IeX087577@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 135775 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Wed, 20 Feb 2008 06:09:20 -0000

http://perforce.freebsd.org/chv.cgi?CH=135775

Change 135775 by jb@jb_freebsd1 on 2008/02/20 06:08:23

	Avoid a core dump.

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_lookup.c#8 edit

Differences ...

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_lookup.c#8 (text) ====

@@ -219,6 +219,9 @@
 {
 	ctf_file_t *fp = *fpp; /* caller passes in starting CTF container */
 
+	if (fp == NULL || type < 0)
+		return (NULL);
+
 	if ((fp->ctf_flags & LCTF_CHILD) && CTF_TYPE_ISPARENT(type) &&
 	    (fp = fp->ctf_parent) == NULL) {
 		(void) ctf_set_errno(*fpp, ECTF_NOPARENT);