summaryrefslogtreecommitdiffstats
path: root/contrib/libarchive/tar/test/test_option_L_upper.c
diff options
context:
space:
mode:
authormm <mm@FreeBSD.org>2016-10-12 10:28:22 +0000
committermm <mm@FreeBSD.org>2016-10-12 10:28:22 +0000
commit7f8f8a43cae54b88ca06ba3674a79204ee698a54 (patch)
tree863e52c86db80e8b9c5e1f3ae1f70921a4c739d8 /contrib/libarchive/tar/test/test_option_L_upper.c
parent7c05d1bcc3ae1e7fdf6581cd249a5b0de28fd5c2 (diff)
downloadFreeBSD-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_L_upper.c')
-rw-r--r--contrib/libarchive/tar/test/test_option_L_upper.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/libarchive/tar/test/test_option_L_upper.c b/contrib/libarchive/tar/test/test_option_L_upper.c
index 57abe41..f5a3c5a 100644
--- a/contrib/libarchive/tar/test/test_option_L_upper.c
+++ b/contrib/libarchive/tar/test/test_option_L_upper.c
@@ -69,10 +69,10 @@ DEFINE_TEST(test_option_L_upper)
assertChdir("test2");
assertEqualInt(0,
systemf("%s -xf archive.tar >c.out 2>c.err", testprog));
- assertIsDir("ld1", 0755);
- assertIsReg("d1/link1", 0644);
+ assertIsDir("ld1", umasked(0755));
+ assertIsReg("d1/link1", umasked(0644));
assertIsSymlink("d1/linkX", "fileX");
- assertIsReg("link2", 0644);
+ assertIsReg("link2", umasked(0644));
assertIsSymlink("linkY", "d1/fileY");
assertChdir("..");
@@ -83,10 +83,10 @@ DEFINE_TEST(test_option_L_upper)
assertChdir("test3");
assertEqualInt(0,
systemf("%s -xf archive.tar >c.out 2>c.err", testprog));
- assertIsDir("ld1", 0755);
- assertIsReg("d1/link1", 0644);
+ assertIsDir("ld1", umasked(0755));
+ assertIsReg("d1/link1", umasked(0644));
assertIsSymlink("d1/linkX", "fileX");
- assertIsReg("link2", 0644);
+ assertIsReg("link2", umasked(0644));
assertIsSymlink("linkY", "d1/fileY");
assertChdir("..");
}
OpenPOWER on IntegriCloud