From owner-svn-src-stable@FreeBSD.ORG  Sun May 24 20:49:23 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5A3CA10656F5;
	Sun, 24 May 2009 20:49:22 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AF62F8FC1F;
	Sun, 24 May 2009 20:49:22 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OKnMLQ000837;
	Sun, 24 May 2009 20:49:22 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4OKnMlg000827;
	Sun, 24 May 2009 20:49:22 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200905242049.n4OKnMlg000827@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sun, 24 May 2009 20:49:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192697 - stable/7/usr.sbin/btxld
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 May 2009 20:49:24 -0000

Author: kmacy
Date: Sun May 24 20:49:22 2009
New Revision: 192697
URL: http://svn.freebsd.org/changeset/base/192697

Log:
  merge 177933
  
  Allow for a zero length 'loader'.

Modified:
  stable/7/usr.sbin/btxld/btxld.c

Modified: stable/7/usr.sbin/btxld/btxld.c
==============================================================================
--- stable/7/usr.sbin/btxld/btxld.c	Sun May 24 20:34:29 2009	(r192696)
+++ stable/7/usr.sbin/btxld/btxld.c	Sun May 24 20:49:22 2009	(r192697)
@@ -336,6 +336,8 @@ gethdr(int fd, struct hdr *hdr)
     if (sb.st_size > MAXU32)
 	errx(1, "%s: Too big", fname);
     hdr->size = sb.st_size;
+    if (!hdr->size)
+	return;
     if ((p = mmap(NULL, hdr->size, PROT_READ, MAP_SHARED, fd,
 		  0)) == MAP_FAILED)
 	err(2, "%s", fname);