Sync libarchive with vendor. Relevant vendor changes: PR #905: Support for Zstandard read and write filters PR #922: Avoid overflow when reading corrupt cpio archive Issue #935: heap-based buffer overflow in xml_data (CVE-2017-14166) OSS-Fuzz 2936: Place a limit on the mtree line length OSS-Fuzz 2394: Ensure that the ZIP AES extension header is large enough OSS-Fuzz 573: Read off-by-one error in RAR archives (CVE-2017-14502) MFC after: 1 week Security: CVE-2017-14166, CVE-2017-14502
86 lines
3.1 KiB
C
86 lines
3.1 KiB
C
/*-
|
|
* Copyright (c) 2017 Sean Purcell
|
|
* 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$");
|
|
|
|
DEFINE_TEST(test_option_zstd)
|
|
{
|
|
char *p;
|
|
int r;
|
|
size_t s;
|
|
|
|
/* Create a file. */
|
|
assertMakeFile("f", 0644, "a");
|
|
|
|
/* Archive it with lz4 compression. */
|
|
r = systemf("%s -cf - --zstd f >archive.out 2>archive.err",
|
|
testprog);
|
|
p = slurpfile(&s, "archive.err");
|
|
p[s] = '\0';
|
|
if (r != 0) {
|
|
if (strstr(p, "Unsupported compression") != NULL) {
|
|
skipping("This version of bsdtar was compiled "
|
|
"without zstd support");
|
|
goto done;
|
|
}
|
|
/* POSIX permits different handling of the spawnp
|
|
* system call used to launch the subsidiary
|
|
* program: */
|
|
/* Some systems fail immediately to spawn the new process. */
|
|
if (strstr(p, "Can't launch") != NULL && !canZstd()) {
|
|
skipping("This version of bsdtar uses an external zstd program "
|
|
"but no such program is available on this system.");
|
|
goto done;
|
|
}
|
|
/* Some systems successfully spawn the new process,
|
|
* but fail to exec a program within that process.
|
|
* This results in failure at the first attempt to
|
|
* write. */
|
|
if (strstr(p, "Can't write") != NULL && !canZstd()) {
|
|
skipping("This version of bsdtar uses an external zstd program "
|
|
"but no such program is available on this system.");
|
|
goto done;
|
|
}
|
|
/* On some systems the error won't be detected until closing
|
|
time, by a 127 exit error returned by waitpid. */
|
|
if (strstr(p, "Error closing") != NULL && !canZstd()) {
|
|
skipping("This version of bsdcpio uses an external zstd program "
|
|
"but no such program is available on this system.");
|
|
return;
|
|
}
|
|
failure("--zstd option is broken: %s", p);
|
|
assertEqualInt(r, 0);
|
|
goto done;
|
|
}
|
|
free(p);
|
|
/* Check that the archive file has an lz4 signature. */
|
|
p = slurpfile(&s, "archive.out");
|
|
assert(s > 2);
|
|
assertEqualMem(p, "\x28\xb5\x2f\xfd", 4);
|
|
|
|
done:
|
|
free(p);
|
|
}
|