diff options
| author | mm <mm@FreeBSD.org> | 2012-07-29 06:33:27 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2012-07-29 06:33:27 +0000 |
| commit | 5f5b4acf5158457bcfcd054f99d6b44a258bddf9 (patch) | |
| tree | 3d03599d91ad4a8764921162d3ee690e3990654d /contrib/libarchive | |
| parent | a924dd42d7285ea17a578f61bac0f86561537c64 (diff) | |
| download | FreeBSD-src-5f5b4acf5158457bcfcd054f99d6b44a258bddf9.zip FreeBSD-src-5f5b4acf5158457bcfcd054f99d6b44a258bddf9.tar.gz | |
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
Diffstat (limited to 'contrib/libarchive')
| -rw-r--r-- | contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c b/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c index 9ce38d9..4b08d42 100644 --- a/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c +++ b/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c @@ -485,6 +485,7 @@ setup_acl_posix1e(struct archive_read_disk *a, 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; } |
