diff options
author | mm <mm@FreeBSD.org> | 2011-12-20 20:06:33 +0000 |
---|---|---|
committer | mm <mm@FreeBSD.org> | 2011-12-20 20:06:33 +0000 |
commit | de78128d73d25a4377de7c74ce56bd3f3ee8abe7 (patch) | |
tree | c60338ab5a43518824f6505a33d7628e6358c6e4 /lib/libarchive/archive_read_support_format_zip.c | |
parent | 3e7916ec1c37c8aabb4a4dcd644f98e38eff81f1 (diff) | |
download | FreeBSD-src-de78128d73d25a4377de7c74ce56bd3f3ee8abe7.zip FreeBSD-src-de78128d73d25a4377de7c74ce56bd3f3ee8abe7.tar.gz |
Update libarchive, tar and cpio to version 2.8.5
The following additional vendor revisions are applied:
Revision 3740:
Use archive_clear_error() to clear the error markers.
Obtained from: http://code.google.com/p/libarchive
MFC after: 2 weeks
Diffstat (limited to 'lib/libarchive/archive_read_support_format_zip.c')
-rw-r--r-- | lib/libarchive/archive_read_support_format_zip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libarchive/archive_read_support_format_zip.c b/lib/libarchive/archive_read_support_format_zip.c index 0fa1fa3..a02a2c2 100644 --- a/lib/libarchive/archive_read_support_format_zip.c +++ b/lib/libarchive/archive_read_support_format_zip.c @@ -211,7 +211,7 @@ archive_read_format_zip_bid(struct archive_read *a) /* Get 4k of data beyond where we stopped. */ buff = __archive_read_ahead(a, offset + 4096, &bytes_avail); - if (bytes_avail < offset + 1) + if (buff == NULL) break; p = (const char *)buff + offset; while (p + 9 < (const char *)buff + bytes_avail) { |