From owner-svn-src-head@FreeBSD.ORG  Fri Jul 23 22:24:25 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B1E3E1065676;
	Fri, 23 Jul 2010 22:24:25 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A0F0D8FC15;
	Fri, 23 Jul 2010 22:24:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6NMOPCk034748;
	Fri, 23 Jul 2010 22:24:25 GMT (envelope-from np@svn.freebsd.org)
Received: (from np@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6NMOPUd034746;
	Fri, 23 Jul 2010 22:24:25 GMT (envelope-from np@svn.freebsd.org)
Message-Id: <201007232224.o6NMOPUd034746@svn.freebsd.org>
From: Navdeep Parhar <np@FreeBSD.org>
Date: Fri, 23 Jul 2010 22:24:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r210438 - head/cddl/contrib/opensolaris/tools/ctf/cvt
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Jul 2010 22:24:25 -0000

Author: np
Date: Fri Jul 23 22:24:25 2010
New Revision: 210438
URL: http://svn.freebsd.org/changeset/base/210438

Log:
  Catch up with r210324.  d_buf will be NULL for SHT_NOBITS sections, do not
  attempt to copy from it in that case.
  
  MFC after:	1 month

Modified:
  head/cddl/contrib/opensolaris/tools/ctf/cvt/output.c

Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/output.c
==============================================================================
--- head/cddl/contrib/opensolaris/tools/ctf/cvt/output.c	Fri Jul 23 22:20:26 2010	(r210437)
+++ head/cddl/contrib/opensolaris/tools/ctf/cvt/output.c	Fri Jul 23 22:24:25 2010	(r210438)
@@ -644,7 +644,7 @@ write_file(Elf *src, const char *srcname
 		}
 
 #if !defined(sun)
-		if (ddata->d_buf == NULL) {
+		if (ddata->d_buf == NULL && sdata->d_buf != NULL) {
 			ddata->d_buf = xmalloc(shdr.sh_size);
 			bcopy(sdata->d_buf, ddata->d_buf, shdr.sh_size);
 		}