52c2bb7516
Sync libarchive with vendor. Relevant vendor changes: Issue #795: XAR - do not try to add xattrs without an allocated name PR #812: non-recursive option for extract and list PR #958: support reading metadata from compressed files PR #999: add --exclude-vcs option to bsdtar Issue #1062: treat empty archives with a GNU volume header as valid PR #1074: Handle ZIP files with trailing 0s in the extra fields (Android APK archives) PR #1109: Ignore padding in Zip extra field data (Android APK archives) PR #1167: fix problems related to unreadable directories Issue #1168: fix handling of strtol() and strtoul() PR #1172: RAR5 - fix invalid window buffer read in E8E9 filter PR #1174: ZIP reader - fix of MSZIP signature parsing PR #1175: gzip filter - fix reading files larger than 4GB from memory PR #1177: gzip filter - fix memory leak with repeated header reads PR #1180: ZIP reader - add support for Info-ZIP Unicode Path Extra Field PR #1181: RAR5 - fix merge_block() recursion (OSS-Fuzz 12999, 13029, 13144, 13478, 13490) PR #1183: fix memory leak when decompressing ZIP files with LZMA PR #1184: fix RAR5 OSS-Fuzz issues 12466, 14490, 14491, 12817 OSS-Fuzz 12466: RAR5 - fix buffer overflow when parsing huffman tables OSS-Fuzz 14490, 14491: RAR5 - fix bad shift-left operations OSS-Fuzz 12817: RAR5 - handle a case with truncated huffman tables PR #1186: RAR5 - fix invalid type used for dictionary size mask (OSS-Fuzz 14537) PR #1187: RAR5 - fix integer overflow (OSS-Fuzz 14555) PR #1190: RAR5 - RAR5 don't try to unpack entries marked as directories (OSS-Fuzz 14574) PR #1196: RAR5 - fix a potential SIGSEGV on 32-bit builds OSS-Fuzz 2582: RAR - fix use after free if there is an invalid entry OSS-Fuzz 14331: RAR5 - fix maximum owner name length OSS-Fuzz 13965: RAR5 - use unsigned int for volume number + range check Additional RAR5 reader changes: - support symlinks, hardlinks, file owner, file group, versioned files - change ARCHIVE_FORMAT_RAR_V5 to 0x100000 - set correct mode for readonly directories - support readonly, hidden and system Windows file attributes MFC after: 2 weeks
109 lines
3.4 KiB
C
109 lines
3.4 KiB
C
/*-
|
|
* Copyright (c) 2003-2007 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"
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
static void
|
|
unpack_test(const char *from, const char *options, const char *se)
|
|
{
|
|
int r;
|
|
|
|
/* Create a work dir named after the file we're unpacking. */
|
|
assertMakeDir(from, 0775);
|
|
assertChdir(from);
|
|
|
|
/*
|
|
* Use cpio to unpack the sample archive
|
|
*/
|
|
extract_reference_file(from);
|
|
r = systemf("%s -i %s < %s >unpack.out 2>unpack.err",
|
|
testprog, options, from);
|
|
failure("Error invoking %s -i %s < %s",
|
|
testprog, options, from);
|
|
assertEqualInt(r, 0);
|
|
|
|
/* Verify that nothing went to stderr. */
|
|
if (canSymlink()) {
|
|
failure("Error invoking %s -i %s < %s",
|
|
testprog, options, from);
|
|
assertTextFileContents(se, "unpack.err");
|
|
}
|
|
|
|
/*
|
|
* Verify unpacked files.
|
|
*/
|
|
|
|
/* Regular file with 2 links. */
|
|
assertIsReg("file", 0644);
|
|
failure("%s", from);
|
|
assertFileSize("file", 10);
|
|
assertFileSize("linkfile", 10);
|
|
failure("%s", from);
|
|
assertFileNLinks("file", 2);
|
|
|
|
/* Another name for the same file. */
|
|
failure("%s", from);
|
|
assertIsHardlink("linkfile", "file");
|
|
assertFileSize("file", 10);
|
|
assertFileSize("linkfile", 10);
|
|
|
|
/* Symlink */
|
|
if (canSymlink())
|
|
assertIsSymlink("symlink", "file", 0);
|
|
|
|
/* dir */
|
|
assertIsDir("dir", 0775);
|
|
|
|
assertChdir("..");
|
|
}
|
|
|
|
DEFINE_TEST(test_gcpio_compat)
|
|
{
|
|
assertUmask(0);
|
|
|
|
/* Dearchive sample files with a variety of options. */
|
|
if (canSymlink()) {
|
|
unpack_test("test_gcpio_compat_ref.bin",
|
|
"--no-preserve-owner", "1 block\n");
|
|
unpack_test("test_gcpio_compat_ref.crc",
|
|
"--no-preserve-owner", "2 blocks\n");
|
|
unpack_test("test_gcpio_compat_ref.newc",
|
|
"--no-preserve-owner", "2 blocks\n");
|
|
/* gcpio-2.9 only reads 6 blocks here */
|
|
unpack_test("test_gcpio_compat_ref.ustar",
|
|
"--no-preserve-owner", "7 blocks\n");
|
|
} else {
|
|
unpack_test("test_gcpio_compat_ref_nosym.bin",
|
|
"--no-preserve-owner", "1 block\n");
|
|
unpack_test("test_gcpio_compat_ref_nosym.crc",
|
|
"--no-preserve-owner", "2 blocks\n");
|
|
unpack_test("test_gcpio_compat_ref_nosym.newc",
|
|
"--no-preserve-owner", "2 blocks\n");
|
|
/* gcpio-2.9 only reads 6 blocks here */
|
|
unpack_test("test_gcpio_compat_ref_nosym.ustar",
|
|
"--no-preserve-owner", "7 blocks\n");
|
|
}
|
|
}
|