Skip to content

Commit a8f93f2

Browse files
kientzlekientzle
authored
Merge pull request libarchive#2660 from kevans91/ke/fix-fortify
libarchive/test: fix build when memcpy() is a macro
2 parents 0f9a06d + b76c404 commit a8f93f2

1 file changed

Lines changed: 34 additions & 34 deletions

File tree

‎libarchive/test/test_write_format_mtree_preset_digests.c‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -326,10 +326,10 @@ DEFINE_TEST(test_write_format_mtree_digests_md5_digest_set_no_data)
326326
struct archive_entry *entry;
327327
struct expected_digests ed;
328328

329-
memcpy(ed.md5, (unsigned char[]) {
329+
memcpy(ed.md5, ((unsigned char[]) {
330330
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
331331
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
332-
}, sizeof(ed.md5));
332+
}), sizeof(ed.md5));
333333

334334
#ifdef ARCHIVE_HAS_RMD160
335335
assertEqualInt(ARCHIVE_OK, archive_rmd160_init(&expectedRmd160Ctx));
@@ -419,10 +419,10 @@ DEFINE_TEST(test_write_format_mtree_digests_md5_digest_set_empty_data)
419419
struct archive_entry *entry;
420420
struct expected_digests ed;
421421

422-
memcpy(ed.md5, (unsigned char[]) {
422+
memcpy(ed.md5, ((unsigned char[]) {
423423
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
424424
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
425-
}, sizeof(ed.md5));
425+
}), sizeof(ed.md5));
426426

427427
#ifdef ARCHIVE_HAS_RMD160
428428
assertEqualInt(ARCHIVE_OK, archive_rmd160_init(&expectedRmd160Ctx));
@@ -519,10 +519,10 @@ DEFINE_TEST(test_write_format_mtree_digests_md5_digest_set_non_empty_data)
519519
struct archive_entry *entry;
520520
struct expected_digests ed;
521521

522-
memcpy(ed.md5, (unsigned char[]) {
522+
memcpy(ed.md5, ((unsigned char[]) {
523523
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
524524
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
525-
}, sizeof(ed.md5));
525+
}), sizeof(ed.md5));
526526

527527
#ifdef ARCHIVE_HAS_RMD160
528528
assertEqualInt(ARCHIVE_OK, archive_rmd160_init(&expectedRmd160Ctx));
@@ -710,10 +710,10 @@ DEFINE_TEST(test_write_format_mtree_digests_rmd160_digest_set_empty_data)
710710
struct archive_entry *entry;
711711
struct expected_digests ed;
712712

713-
memcpy(ed.rmd160, (unsigned char[]) {
713+
memcpy(ed.rmd160, ((unsigned char[]) {
714714
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
715715
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed
716-
}, sizeof(ed.rmd160));
716+
}), sizeof(ed.rmd160));
717717

718718
#ifdef ARCHIVE_HAS_MD5
719719
assertEqualInt(ARCHIVE_OK, archive_md5_init(&expectedMd5Ctx));
@@ -810,10 +810,10 @@ DEFINE_TEST(test_write_format_mtree_digests_rmd160_digest_set_non_empty_data)
810810
struct archive_entry *entry;
811811
struct expected_digests ed;
812812

813-
memcpy(ed.rmd160, (unsigned char[]) {
813+
memcpy(ed.rmd160, ((unsigned char[]) {
814814
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
815815
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed
816-
}, sizeof(ed.rmd160));
816+
}), sizeof(ed.rmd160));
817817

818818
#ifdef ARCHIVE_HAS_MD5
819819
assertEqualInt(ARCHIVE_OK, archive_md5_init(&expectedMd5Ctx));
@@ -910,10 +910,10 @@ DEFINE_TEST(test_write_format_mtree_digests_sha1_digest_set_no_data)
910910
struct archive_entry *entry;
911911
struct expected_digests ed;
912912

913-
memcpy(ed.sha1, (unsigned char[]) {
913+
memcpy(ed.sha1, ((unsigned char[]) {
914914
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
915915
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed
916-
}, sizeof(ed.sha1));
916+
}), sizeof(ed.sha1));
917917

918918
#ifdef ARCHIVE_HAS_MD5
919919
assertEqualInt(ARCHIVE_OK, archive_md5_init(&expectedMd5Ctx));
@@ -1003,10 +1003,10 @@ DEFINE_TEST(test_write_format_mtree_digests_sha1_digest_set_empty_data)
10031003
struct archive_entry *entry;
10041004
struct expected_digests ed;
10051005

1006-
memcpy(ed.sha1, (unsigned char[]) {
1006+
memcpy(ed.sha1, ((unsigned char[]) {
10071007
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
10081008
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed
1009-
}, sizeof(ed.sha1));
1009+
}), sizeof(ed.sha1));
10101010

10111011
#ifdef ARCHIVE_HAS_MD5
10121012
assertEqualInt(ARCHIVE_OK, archive_md5_init(&expectedMd5Ctx));
@@ -1103,10 +1103,10 @@ DEFINE_TEST(test_write_format_mtree_digests_sha1_digest_set_non_empty_data)
11031103
struct archive_entry *entry;
11041104
struct expected_digests ed;
11051105

1106-
memcpy(ed.sha1, (unsigned char[]) {
1106+
memcpy(ed.sha1, ((unsigned char[]) {
11071107
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
11081108
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed
1109-
}, sizeof(ed.sha1));
1109+
}), sizeof(ed.sha1));
11101110

11111111
#ifdef ARCHIVE_HAS_MD5
11121112
assertEqualInt(ARCHIVE_OK, archive_md5_init(&expectedMd5Ctx));
@@ -1203,12 +1203,12 @@ DEFINE_TEST(test_write_format_mtree_digests_sha256_digest_set_no_data)
12031203
struct archive_entry *entry;
12041204
struct expected_digests ed;
12051205

1206-
memcpy(ed.sha256, (unsigned char[]) {
1206+
memcpy(ed.sha256, ((unsigned char[]) {
12071207
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
12081208
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
12091209
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
12101210
0xfe, 0xed
1211-
}, sizeof(ed.sha256));
1211+
}), sizeof(ed.sha256));
12121212

12131213
#ifdef ARCHIVE_HAS_MD5
12141214
assertEqualInt(ARCHIVE_OK, archive_md5_init(&expectedMd5Ctx));
@@ -1298,12 +1298,12 @@ DEFINE_TEST(test_write_format_mtree_digests_sha256_digest_set_empty_data)
12981298
struct archive_entry *entry;
12991299
struct expected_digests ed;
13001300

1301-
memcpy(ed.sha256, (unsigned char[]) {
1301+
memcpy(ed.sha256, ((unsigned char[]) {
13021302
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
13031303
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
13041304
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
13051305
0xfe, 0xed
1306-
}, sizeof(ed.sha256));
1306+
}), sizeof(ed.sha256));
13071307

13081308
#ifdef ARCHIVE_HAS_MD5
13091309
assertEqualInt(ARCHIVE_OK, archive_md5_init(&expectedMd5Ctx));
@@ -1400,12 +1400,12 @@ DEFINE_TEST(test_write_format_mtree_digests_sha256_digest_set_non_empty_data)
14001400
struct archive_entry *entry;
14011401
struct expected_digests ed;
14021402

1403-
memcpy(ed.sha256, (unsigned char[]) {
1403+
memcpy(ed.sha256, ((unsigned char[]) {
14041404
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
14051405
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
14061406
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
14071407
0xfe, 0xed
1408-
}, sizeof(ed.sha256));
1408+
}), sizeof(ed.sha256));
14091409

14101410
#ifdef ARCHIVE_HAS_MD5
14111411
assertEqualInt(ARCHIVE_OK, archive_md5_init(&expectedMd5Ctx));
@@ -1502,13 +1502,13 @@ DEFINE_TEST(test_write_format_mtree_digests_sha384_digest_set_no_data)
15021502
struct archive_entry *entry;
15031503
struct expected_digests ed;
15041504

1505-
memcpy(ed.sha384, (unsigned char[]) {
1505+
memcpy(ed.sha384, ((unsigned char[]) {
15061506
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
15071507
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
15081508
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
15091509
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
15101510
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed
1511-
}, sizeof(ed.sha384));
1511+
}), sizeof(ed.sha384));
15121512

15131513
#ifdef ARCHIVE_HAS_MD5
15141514
assertEqualInt(ARCHIVE_OK, archive_md5_init(&expectedMd5Ctx));
@@ -1598,13 +1598,13 @@ DEFINE_TEST(test_write_format_mtree_digests_sha384_digest_set_empty_data)
15981598
struct archive_entry *entry;
15991599
struct expected_digests ed;
16001600

1601-
memcpy(ed.sha384, (unsigned char[]) {
1601+
memcpy(ed.sha384, ((unsigned char[]) {
16021602
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
16031603
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
16041604
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
16051605
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
16061606
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed
1607-
}, sizeof(ed.sha384));
1607+
}), sizeof(ed.sha384));
16081608

16091609
#ifdef ARCHIVE_HAS_MD5
16101610
assertEqualInt(ARCHIVE_OK, archive_md5_init(&expectedMd5Ctx));
@@ -1701,13 +1701,13 @@ DEFINE_TEST(test_write_format_mtree_digests_sha384_digest_set_non_empty_data)
17011701
struct archive_entry *entry;
17021702
struct expected_digests ed;
17031703

1704-
memcpy(ed.sha384, (unsigned char[]) {
1704+
memcpy(ed.sha384, ((unsigned char[]) {
17051705
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
17061706
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
17071707
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
17081708
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
17091709
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed
1710-
}, sizeof(ed.sha384));
1710+
}), sizeof(ed.sha384));
17111711

17121712
#ifdef ARCHIVE_HAS_MD5
17131713
assertEqualInt(ARCHIVE_OK, archive_md5_init(&expectedMd5Ctx));
@@ -1804,15 +1804,15 @@ DEFINE_TEST(test_write_format_mtree_digests_sha512_digest_set_no_data)
18041804
struct archive_entry *entry;
18051805
struct expected_digests ed;
18061806

1807-
memcpy(ed.sha512, (unsigned char[]) {
1807+
memcpy(ed.sha512, ((unsigned char[]) {
18081808
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
18091809
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
18101810
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
18111811
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
18121812
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
18131813
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
18141814
0xfe, 0xed, 0xfe, 0xed
1815-
}, sizeof(ed.sha512));
1815+
}), sizeof(ed.sha512));
18161816

18171817
#ifdef ARCHIVE_HAS_MD5
18181818
assertEqualInt(ARCHIVE_OK, archive_md5_init(&expectedMd5Ctx));
@@ -1903,15 +1903,15 @@ DEFINE_TEST(test_write_format_mtree_digests_sha512_digest_set_empty_data)
19031903
struct archive_entry *entry;
19041904
struct expected_digests ed;
19051905

1906-
memcpy(ed.sha512, (unsigned char[]) {
1906+
memcpy(ed.sha512, ((unsigned char[]) {
19071907
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
19081908
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
19091909
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
19101910
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
19111911
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
19121912
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
19131913
0xfe, 0xed, 0xfe, 0xed
1914-
}, sizeof(ed.sha512));
1914+
}), sizeof(ed.sha512));
19151915

19161916
#ifdef ARCHIVE_HAS_MD5
19171917
assertEqualInt(ARCHIVE_OK, archive_md5_init(&expectedMd5Ctx));
@@ -2009,15 +2009,15 @@ DEFINE_TEST(test_write_format_mtree_digests_sha512_digest_set_non_empty_data)
20092009
struct archive_entry *entry;
20102010
struct expected_digests ed;
20112011

2012-
memcpy(ed.sha512, (unsigned char[]) {
2012+
memcpy(ed.sha512, ((unsigned char[]) {
20132013
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
20142014
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
20152015
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
20162016
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
20172017
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
20182018
0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed,
20192019
0xfe, 0xed, 0xfe, 0xed
2020-
}, sizeof(ed.sha512));
2020+
}), sizeof(ed.sha512));
20212021

20222022
#ifdef ARCHIVE_HAS_MD5
20232023
assertEqualInt(ARCHIVE_OK, archive_md5_init(&expectedMd5Ctx));

0 commit comments

Comments
 (0)