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

If we don't know the file size, leave the file size unset.

Browse Source 
If it's not a regular file, don't return any data, even if the size is unknown.

Update the Zip test with a hand-tweaked Zip archive that has a
directory (with length-at-end set), a regular file without
length-at-end set, and a regular file with length-at-end set and a bad
CRC.  Update the test code to verify that the file size is unset
for the regular file with length-at-end.

MFC after:	7 days
This commit is contained in:
kientzle 2008-10-21 05:08:35 +00:00
parent 3a94b40d72
commit 24084253f7
3 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/libarchive/archive_read_support_format_zip.c
View File

@ -444,7 +444,9 @@ zip_read_file_header(struct archive_read *a, struct archive_entry *entry,
archive_entry_set_mtime(entry, zip->mtime, 0); archive_entry_set_mtime(entry, zip->mtime, 0);
archive_entry_set_ctime(entry, zip->ctime, 0); archive_entry_set_ctime(entry, zip->ctime, 0);
archive_entry_set_atime(entry, zip->atime, 0); archive_entry_set_atime(entry, zip->atime, 0);
archive_entry_set_size(entry, zip->uncompressed_size); /* Set the size only if it's meaningful. */
if (0 == (zip->flags & ZIP_LENGTH_AT_END))
archive_entry_set_size(entry, zip->uncompressed_size);
zip->entry_bytes_remaining = zip->compressed_size; zip->entry_bytes_remaining = zip->compressed_size;
zip->entry_offset = 0; zip->entry_offset = 0;
@ -573,12 +575,16 @@ archive_read_format_zip_read_data(struct archive_read *a,
} }
break; break;
} }
if (r != ARCHIVE_OK)
return (r);
/* Update checksum */ /* Update checksum */
if (r == ARCHIVE_OK && *size) { if (*size)
zip->entry_crc32 = zip->entry_crc32 =
crc32(zip->entry_crc32, *buff, *size); crc32(zip->entry_crc32, *buff, *size);
} /* Return EOF immediately if this is a non-regular file. */
return (r); if (AE_IFREG != (zip->mode & AE_IFMT))
return (ARCHIVE_EOF);
return (ARCHIVE_OK);
} }
/* /*

9
lib/libarchive/test/test_read_format_zip.c
View File

@ -25,6 +25,12 @@
#include "test.h" #include "test.h"
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
/*
* The reference file for this has been manually tweaked so that:
* * file2 has length-at-end but file1 does not
* * file2 has an invalid CRC
*/
DEFINE_TEST(test_read_format_zip) DEFINE_TEST(test_read_format_zip)
{ {
const char *refname = "test_read_format_zip.zip"; const char *refname = "test_read_format_zip.zip";
@ -57,7 +63,8 @@ DEFINE_TEST(test_read_format_zip)
assertA(0 == archive_read_next_header(a, &ae)); assertA(0 == archive_read_next_header(a, &ae));
assertEqualString("file2", archive_entry_pathname(ae)); assertEqualString("file2", archive_entry_pathname(ae));
assertEqualInt(1179605932, archive_entry_mtime(ae)); assertEqualInt(1179605932, archive_entry_mtime(ae));
assertEqualInt(18, archive_entry_size(ae)); failure("file2 has length-at-end, so we shouldn't see a valid size");
assertEqualInt(0, archive_entry_size_is_set(ae));
failure("file2 has a bad CRC, so reading to end should fail"); failure("file2 has a bad CRC, so reading to end should fail");
assertEqualInt(ARCHIVE_WARN, archive_read_data(a, buff, 19)); assertEqualInt(ARCHIVE_WARN, archive_read_data(a, buff, 19));
assert(0 == memcmp(buff, "hello\nhello\nhello\n", 18)); assert(0 == memcmp(buff, "hello\nhello\nhello\n", 18));

19
lib/libarchive/test/test_read_format_zip.zip.uu
View File

@ -1,13 +1,14 @@
$FreeBSD$ $FreeBSD$
begin 644 test_read_format_zip.zip begin 644 test_read_format_zip.zip
M4$L#!`H``````%EFLS8````````````````$`!4`9&ER+U54"0`#&55/1AE5 M4$L#!`H`"````%EFLS8````````````````$`!4`9&ER+U54"0`#&55/1M19
M3T95>`0`Z`/H`U!+`P04````"`!O9K,V.C=F/0H````2````!0`5`&9I;&4Q M_4A5>`0`Z`/H`U!+!P@```````````````!02P,$%`````@`;V:S-CHW9CT*
M550)``-!54]&K%M/1E5X!`#H`^@#RTC-R<GGRD`B`5!+`P04````"`!::K,V M````$@````4`%0!F:6QE,554"0`#055/1L!9_4A5>`0`Z`/H`\M(S<G)Y\I`
M>%8T$@H````2````!0`5`&9I;&4R550)``.L6T]&K%M/1E5X!`#H`^@#RTC- M(@%02P,$%``(``@`6FJS-@``````````$@````4`%0!F:6QE,E54"0`#K%M/
MR<GGRD`B`5!+`0(7`PH``````%EFLS8````````````````$``T````````` M1L!9_4A5>`0`Z`/H`\M(S<G)Y\I`(@%02P<(.C=F$@H````2````4$L!`A<#
M$`#M00````!D:7(O550%``,954]&57@``%!+`0(7`Q0````(`&]FLS8Z-V8] M"@`(````66:S-@````````````````0`#0`````````0`.U!`````&1I<B]5
M"@```!(````%``T```````$```"D@3<```!F:6QE,554!0`#055/1E5X``!0 M5`4``QE53T95>```4$L!`A<#%``(``@`;V:S-CHW9CT*````$@````4`#0``
M2P$"%P,4````"`!::K,V>%8T$@H````2````!0`-```````!````I(%Y```` M`````0```.V!1P```&9I;&4Q550%``-!54]&57@``%!+`0(7`Q0`"``(`%IJ
H9FEL93)55`4``ZQ;3T95>```4$L%!@`````#``,`OP```+L````````` MLS8Z-V8]"@```!(````%``T```````$```#M@8D```!F:6QE,E54!0`#K%M/
;1E5X``!02P4&``````,``P"_````VP``````
` `
end end