From owner-svn-src-head@FreeBSD.ORG  Sun Jul 29 06:33:28 2012
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 A45D6106566B;
	Sun, 29 Jul 2012 06:33:28 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 901B28FC16;
	Sun, 29 Jul 2012 06:33:28 +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 q6T6XSdc017048;
	Sun, 29 Jul 2012 06:33:28 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6T6XSn8017046;
	Sun, 29 Jul 2012 06:33:28 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201207290633.q6T6XSn8017046@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Sun, 29 Jul 2012 06:33:28 +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: r238882 - head/contrib/libarchive/libarchive
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: Sun, 29 Jul 2012 06:33:28 -0000

Author: mm
Date: Sun Jul 29 06:33:27 2012
New Revision: 238882
URL: http://svn.freebsd.org/changeset/base/238882

Log:
  Fix endless loop if reading unsupported ACL type.
  Apply fix from vendor's master branch.
  
  References:
  https://github.com/libarchive/libarchive/commit/d8b9dbd
  
  Reported on:	freebsd-current@
  Obtained from:	libarchive

Modified:
  head/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c

Modified: head/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c	Sun Jul 29 04:28:29 2012	(r238881)
+++ head/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c	Sun Jul 29 06:33:27 2012	(r238882)
@@ -485,6 +485,7 @@ setup_acl_posix1e(struct archive_read_di
 			ae_tag = ARCHIVE_ENTRY_ACL_OTHER;
 		} else {
 			/* Skip types that libarchive can't support. */
+			s = acl_get_entry(acl, ACL_NEXT_ENTRY, &acl_entry);
 			continue;
 		}