diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2012-07-29 06:33:27 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2012-07-29 06:33:27 +0000 |
| commit | 88b860fc7ae2c366450d73c3476f461497ab3cef (patch) | |
| tree | 3d03599d91ad4a8764921162d3ee690e3990654d /contrib | |
| parent | 9a5d82ab307e27c733fd66846445bd8b9be52070 (diff) | |
| download | src-88b860fc7ae2c366450d73c3476f461497ab3cef.tar.gz src-88b860fc7ae2c366450d73c3476f461497ab3cef.zip | |
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
Notes
Notes:
svn path=/head/; revision=238882
Diffstat (limited to 'contrib')
| -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 9ce38d9a77a2..4b08d429f9ba 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; } |