diff options
Diffstat (limited to 'archivers/libarchive/files/libarchive/test/test_read_format_zip_extra_padding.c')
| -rw-r--r-- | archivers/libarchive/files/libarchive/test/test_read_format_zip_extra_padding.c | 93 |
1 files changed, 93 insertions, 0 deletions
diff --git a/archivers/libarchive/files/libarchive/test/test_read_format_zip_extra_padding.c b/archivers/libarchive/files/libarchive/test/test_read_format_zip_extra_padding.c new file mode 100644 index 00000000000..54f7fa04ee8 --- /dev/null +++ b/archivers/libarchive/files/libarchive/test/test_read_format_zip_extra_padding.c @@ -0,0 +1,93 @@ +/*- + * Copyright (c) 2003-2018 Tim Kientzle + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +#include "test.h" + +/* + * Test archive verifies that we ignore padding in the extra field. + * + * APPNOTE.txt does not provide any provision for padding the extra + * field, so libarchive used to error when there were unconsumed + * bytes. Apparently, some Zip writers do routinely put zero padding + * in the extra field. + * + * The extra fields in this test (for both the local file header + * and the central directory entry) are formatted as follows: + * + * 0000 0000 - unrecognized field with type zero, zero bytes + * 5554 0900 03d258155cdb58155c - UX field with length 9 + * 0000 0400 00000000 - unrecognized field with type zero, four bytes + * 000000 - three bytes padding + * + * The two valid type zero fields should be skipped and ignored, as + * should the three bytes padding (which is too short to be a valid + * extra data object). If there were no errors and we read the UX + * field correctly, then we've correctly handled all of the padding + * fields above. + */ + + +static void verify(struct archive *a) { + struct archive_entry *ae; + + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualString("a", archive_entry_pathname(ae)); + assertEqualInt(AE_IFREG | 0664, archive_entry_mode(ae)); + assertEqualInt(0x5c1558d2, archive_entry_mtime(ae)); + assertEqualInt(0, archive_entry_ctime(ae)); + assertEqualInt(0x5c1558db, archive_entry_atime(ae)); + + assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); +} + +DEFINE_TEST(test_read_format_zip_extra_padding) +{ + const char *refname = "test_read_format_zip_extra_padding.zip"; + struct archive *a; + char *p; + size_t s; + + extract_reference_file(refname); + + /* Verify with seeking reader. */ + assert((a = archive_read_new()) != NULL); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, refname, 7)); + verify(a); + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); + + /* Verify with streaming reader. */ + p = slurpfile(&s, refname); + assert((a = archive_read_new()) != NULL); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); + assertEqualIntA(a, ARCHIVE_OK, read_open_memory(a, p, s, 3)); + verify(a); + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); + + free(p); +} |