Author: kientzle
Date: Thu Sep 17 06:31:59 2009
New Revision: 197266
URL: http://svn.freebsd.org/changeset/base/197266
Log:
MFC r196962: Fix /usr/bin/unzip: A bug deep in libarchive's read-ahead logic
(incorrect handling of zero-length reads before the copy buffer is
allocated) is masked by the iso9660 taster. Tar and cpio both enable
that taster so were protected from the bug; unzip is susceptible.
This both fixes the bug and updates the test harness to exercise
this case.
Submitted by: Ed Schouten diagnosed the bug and drafted a patch
Approved by: re (kib)
Modified:
stable/8/lib/libarchive/ (props changed)
stable/8/lib/libarchive/archive_read.c
stable/8/lib/libarchive/test/test_compat_zip.c
Modified: stable/8/lib/libarchive/archive_read.c
==============================================================================
--- stable/8/lib/libarchive/archive_read.c Thu Sep 17 05:30:55 2009
(r197265)
+++ stable/8/lib/libarchive/archive_read.c Thu Sep 17 06:31:59 2009
(r197266)
@@ -928,9 +928,12 @@ __archive_read_filter_ahead(struct archi
for (;;) {
/*
- * If we can satisfy from the copy buffer, we're done.
+ * If we can satisfy from the copy buffer (and the
+ * copy buffer isn't empty), we're done. In particular,
+ * note that min == 0 is a perfectly well-defined
+ * request.
*/
- if (filter->avail >= min) {
+ if (filter->avail >= min && filter->avail > 0) {
if (avail != NULL)
*avail = filter->avail;
return (filter->next);
Modified: stable/8/lib/libarchive/test/test_compat_zip.c
==============================================================================
--- stable/8/lib/libarchive/test/test_compat_zip.c Thu Sep 17 05:30:55
2009 (r197265)
+++ stable/8/lib/libarchive/test/test_compat_zip.c Thu Sep 17 06:31:59
2009 (r197266)
@@ -36,7 +36,7 @@ test_compat_zip_1(void)
assert((a = archive_read_new()) != NULL);
assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a));
- assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_zip(a));
extract_reference_file(name);
assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, name,
10240));
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
