From owner-svn-src-all@FreeBSD.ORG  Tue Aug 21 22:42:47 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 53D6E1065672;
	Tue, 21 Aug 2012 22:42:47 +0000 (UTC) (envelope-from kan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4020F8FC15;
	Tue, 21 Aug 2012 22:42:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7LMglNa020005;
	Tue, 21 Aug 2012 22:42:47 GMT (envelope-from kan@svn.freebsd.org)
Received: (from kan@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7LMglOF020003;
	Tue, 21 Aug 2012 22:42:47 GMT (envelope-from kan@svn.freebsd.org)
Message-Id: <201208212242.q7LMglOF020003@svn.freebsd.org>
From: Alexander Kabaev <kan@FreeBSD.org>
Date: Tue, 21 Aug 2012 22:42:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239546 - releng/9.1/libexec/rtld-elf
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Aug 2012 22:42:47 -0000

Author: kan
Date: Tue Aug 21 22:42:46 2012
New Revision: 239546
URL: http://svn.freebsd.org/changeset/base/239546

Log:
  MFC r239470: Do not call process_nodelete with NULL object pointer.
  
  The place where the function is called can be reached if object loading
  and relocation fails too, in which case obj pointer will be NULL. Do not
  call process_nodelete then, or crash will follow.
  
  Pointy hat to: kan
  Approved by: re (kib)

Modified:
  releng/9.1/libexec/rtld-elf/rtld.c
Directory Properties:
  releng/9.1/libexec/rtld-elf/   (props changed)

Modified: releng/9.1/libexec/rtld-elf/rtld.c
==============================================================================
--- releng/9.1/libexec/rtld-elf/rtld.c	Tue Aug 21 22:28:14 2012	(r239545)
+++ releng/9.1/libexec/rtld-elf/rtld.c	Tue Aug 21 22:42:46 2012	(r239546)
@@ -2698,7 +2698,8 @@ dlopen_object(const char *name, int fd, 
 	     * This has to be done after we have loaded all of the
 	     * dependencies, so that we do not miss any.
 	     */
-	     process_nodelete(obj);
+	    if (obj != NULL)
+		process_nodelete(obj);
 	} else {
 	    /*
 	     * Bump the reference counts for objects on this DAG.  If