From owner-p4-projects@FreeBSD.ORG  Mon Dec 22 18:22:14 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 87E2716A4D0; Mon, 22 Dec 2003 18:22:14 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6048816A4CE
	for <perforce@freebsd.org>; Mon, 22 Dec 2003 18:22:14 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8C49043D46
	for <perforce@freebsd.org>; Mon, 22 Dec 2003 18:22:13 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBN2MD0B037893
	for <perforce@freebsd.org>; Mon, 22 Dec 2003 18:22:13 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBN2MDZ2037887
	for perforce@freebsd.org; Mon, 22 Dec 2003 18:22:13 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Mon, 22 Dec 2003 18:22:13 -0800 (PST)
Message-Id: <200312230222.hBN2MDZ2037887@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 44215 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Tue, 23 Dec 2003 02:22:14 -0000

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

Change 44215 by peter@peter_daintree on 2003/12/22 18:21:22

	dont set interp if it wasn't already set.

Affected files ...

.. //depot/projects/hammer/sys/kern/imgact_elf.c#12 edit

Differences ...

==== //depot/projects/hammer/sys/kern/imgact_elf.c#12 (text+ko) ====

@@ -708,7 +708,7 @@
 		goto fail;
 	}
 	sv = brand_info->sysvec;
-	if (brand_info->interp_newpath != NULL)
+	if (interp != NULL && brand_info->interp_newpath != NULL)
 		interp = brand_info->interp_newpath;
 
 	if ((error = exec_extract_strings(imgp)) != 0)