d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r196962: Fix /usr/bin/unzip: A bug deep in libarchive's read-ahead logic

Browse Source 
(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)
This commit is contained in:
Tim Kientzle 2009-09-17 06:31:59 +00:00
parent 24048b0cb3
commit 52bd177ff7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/stable/8/; revision=197266
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/libarchive/archive_read.c
View File

@ -928,9 +928,12 @@ __archive_read_filter_ahead(struct archive_read_filter *filter,
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);

2
lib/libarchive/test/test_compat_zip.c
View File

@ -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));