diff options
| author | mm <mm@FreeBSD.org> | 2016-10-12 10:28:22 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2016-10-12 10:28:22 +0000 |
| commit | 7f8f8a43cae54b88ca06ba3674a79204ee698a54 (patch) | |
| tree | 863e52c86db80e8b9c5e1f3ae1f70921a4c739d8 /contrib/libarchive/tar/test/test_option_U_upper.c | |
| parent | 7c05d1bcc3ae1e7fdf6581cd249a5b0de28fd5c2 (diff) | |
| download | FreeBSD-src-7f8f8a43cae54b88ca06ba3674a79204ee698a54.zip FreeBSD-src-7f8f8a43cae54b88ca06ba3674a79204ee698a54.tar.gz | |
MFC r306670:
Sync libarchive with vendor including security fixes.
Important vendor bugfixes (relevant to FreeBSD):
#747: Out of bounds read in mtree parser
#761: heap-based buffer overflow in read_Header (7-zip)
#794: Invalid file on bsdtar command line results in internal errors (1)
PR: 213092 (1)
Diffstat (limited to 'contrib/libarchive/tar/test/test_option_U_upper.c')
| -rw-r--r-- | contrib/libarchive/tar/test/test_option_U_upper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/libarchive/tar/test/test_option_U_upper.c b/contrib/libarchive/tar/test/test_option_U_upper.c index 4d77cb0..2c43e00 100644 --- a/contrib/libarchive/tar/test/test_option_U_upper.c +++ b/contrib/libarchive/tar/test/test_option_U_upper.c @@ -135,7 +135,7 @@ DEFINE_TEST(test_option_U_upper) assertMakeSymlink("d1/file1", "d1/realfile1"); assertEqualInt(0, systemf("%s -xf ../archive.tar d1/file1 >test.out 2>test.err", testprog)); - assertIsReg("d1/file1", 0644); + assertIsReg("d1/file1", umasked(0644)); assertFileContents("d1/file1", 8, "d1/file1"); assertFileContents("realfile1", 9, "d1/realfile1"); assertEmptyFile("test.out"); @@ -150,7 +150,7 @@ DEFINE_TEST(test_option_U_upper) assertMakeSymlink("d1/file1", "d1/realfile1"); assertEqualInt(0, systemf("%s -xPUf ../archive.tar d1/file1 >test.out 2>test.err", testprog)); - assertIsReg("d1/file1", 0644); + assertIsReg("d1/file1", umasked(0644)); assertFileContents("d1/file1", 8, "d1/file1"); assertFileContents("realfile1", 9, "d1/realfile1"); assertEmptyFile("test.out"); |
