From owner-svn-src-all@FreeBSD.ORG  Fri Jan  2 02:47:49 2015
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:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F1809157;
 Fri,  2 Jan 2015 02:47:48 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DD38764C56;
 Fri,  2 Jan 2015 02:47:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t022lmM4014441;
 Fri, 2 Jan 2015 02:47:48 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t022lm7B014440;
 Fri, 2 Jan 2015 02:47:48 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201501020247.t022lm7B014440@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Fri, 2 Jan 2015 02:47:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r276524 - head/contrib/elftoolchain/libelf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
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/options/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: Fri, 02 Jan 2015 02:47:49 -0000

Author: emaste
Date: Fri Jan  2 02:47:47 2015
New Revision: 276524
URL: https://svnweb.freebsd.org/changeset/base/276524

Log:
  libelf: Return an error instead of asserting on an invalid ar file
  
  Upstream elftoolchain ticket 467
  http://sourceforge.net/p/elftoolchain/tickets/467/
  
  Reported by:	Alexander Cherepanov
  MFC after:	2 weeks
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/contrib/elftoolchain/libelf/libelf_ar_util.c

Modified: head/contrib/elftoolchain/libelf/libelf_ar_util.c
==============================================================================
--- head/contrib/elftoolchain/libelf/libelf_ar_util.c	Fri Jan  2 01:05:08 2015	(r276523)
+++ head/contrib/elftoolchain/libelf/libelf_ar_util.c	Fri Jan  2 02:47:47 2015	(r276524)
@@ -279,7 +279,8 @@ _libelf_ar_open(Elf *e, int reporterror)
 	 */
 	if (arh.ar_name[0] == '/') {
 
-		assert(sz > 0);
+		if (sz == 0)
+			goto error;
 
 		e->e_flags |= LIBELF_F_AR_VARIANT_SVR4;