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
90 lines
3.0 KiB
C
90 lines
3.0 KiB
C
/*-
|
|
* Copyright (c) 2018 The FreeBSD Foundation
|
|
* All rights reserved.
|
|
*
|
|
* This software was developed by Arshan Khanifar <arshankhanifar@gmail.com>
|
|
* under sponsorship from the FreeBSD Foundation.
|
|
*
|
|
* 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$");
|
|
|
|
DEFINE_TEST(test_option_C_mtree)
|
|
{
|
|
char *p0;
|
|
size_t s;
|
|
int r;
|
|
p0 = NULL;
|
|
char *content = "./foo type=file uname=root gname=root mode=0755\n";
|
|
char *filename = "output.tar";
|
|
#if defined(_WIN32) && !defined(CYGWIN)
|
|
char *p;
|
|
#endif
|
|
|
|
/* an absolute path to mtree file */
|
|
char *mtree_file = "/METALOG.mtree";
|
|
char *absolute_path = malloc(strlen(testworkdir) + strlen(mtree_file) + 1);
|
|
strcpy(absolute_path, testworkdir);
|
|
strcat(absolute_path, mtree_file );
|
|
|
|
/* Create an archive using an mtree file. */
|
|
assertMakeFile(absolute_path, 0777, content);
|
|
assertMakeDir("bar", 0775);
|
|
assertMakeFile("bar/foo", 0777, "abc");
|
|
|
|
#if defined(_WIN32) && !defined(CYGWIN)
|
|
p = absolute_path;
|
|
while(*p != '\0') {
|
|
if (*p == '/')
|
|
*p = '\\';
|
|
p++;
|
|
}
|
|
|
|
r = systemf("%s -cf %s -C bar @%s >step1.out 2>step1.err", testprog, filename, absolute_path);
|
|
failure("Error invoking %s -cf %s -C bar @%s", testprog, filename, absolute_path);
|
|
#else
|
|
r = systemf("%s -cf %s -C bar \"@%s\" >step1.out 2>step1.err", testprog, filename, absolute_path);
|
|
failure("Error invoking %s -cf %s -C bar \"@%s\"", testprog, filename, absolute_path);
|
|
#endif
|
|
|
|
assertEqualInt(r, 0);
|
|
assertEmptyFile("step1.out");
|
|
assertEmptyFile("step1.err");
|
|
|
|
/* Do validation of the constructed archive. */
|
|
|
|
p0 = slurpfile(&s, "output.tar");
|
|
if (!assert(p0 != NULL))
|
|
goto done;
|
|
if (!assert(s >= 2048))
|
|
goto done;
|
|
assertEqualMem(p0 + 0, "./foo", 5);
|
|
assertEqualMem(p0 + 512, "abc", 3);
|
|
assertEqualMem(p0 + 1024, "\0\0\0\0\0\0\0\0", 8);
|
|
assertEqualMem(p0 + 1536, "\0\0\0\0\0\0\0\0", 8);
|
|
done:
|
|
free(p0);
|
|
free(absolute_path);
|
|
}
|
|
|
|
|