From: naota <naota@elisp.net>
Date: Fri, 25 May 2012 04:03:21 +0000 (+0900)
Subject: Avoid infinite loop when there's unsupported acl type
X-Git-Tag: v3.1.0~91^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F13%2Fhead;p=thirdparty%2Flibarchive.git

Avoid infinite loop when there's unsupported acl type
---

diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
index 7987fa5b3..25b1edcad 100644
--- a/libarchive/archive_read_disk_entry_from_file.c
+++ b/libarchive/archive_read_disk_entry_from_file.c
@@ -584,6 +584,7 @@ translate_acl(struct archive_read_disk *a,
 			break;
 		default:
 			/* Skip types that libarchive can't support. */
+			s = acl_get_entry(acl, ACL_NEXT_ENTRY, &acl_entry);
 			continue;
 		}