svn commit: r238882 - head/contrib/libarchive/libarchive

[Martin Matuska]

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;
 		}