diff options
| author | Justin DeMartino <jjdemartino@google.com> | 2020-09-21 13:23:58 -0700 |
|---|---|---|
| committer | Justin DeMartino <jjdemartino@google.com> | 2020-09-21 13:23:58 -0700 |
| commit | 7e4fe6a28b718ab97c08811566238af2893ca65b (patch) | |
| tree | 5413a5ec890b5a1ac4fbbe4548b5014e41a2591b /tests/fortify_test.cpp | |
| parent | dcdcb3fa15004669823a3a118189d9d72ff30852 (diff) | |
| parent | ab08b955a34423d53b28a6210e7530e67241af4a (diff) | |
Merge SP1A.200921.001
Change-Id: Id2ab019914bb555dadf52c46b8403c0d5fb3c20a
Diffstat (limited to 'tests/fortify_test.cpp')
| -rw-r--r-- | tests/fortify_test.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/fortify_test.cpp b/tests/fortify_test.cpp index 6907abe9b..3ca0223b2 100644 --- a/tests/fortify_test.cpp +++ b/tests/fortify_test.cpp @@ -204,8 +204,9 @@ TEST_F(DEATHTEST, memchr_fortified2) { foo myfoo; volatile int asize = sizeof(myfoo.a) + 1; memcpy(myfoo.a, "0123456789", sizeof(myfoo.a)); - ASSERT_FORTIFY(printf("%s", memchr(myfoo.a, 'a', asize))); - ASSERT_FORTIFY(printf("%s", memchr(static_cast<const void*>(myfoo.a), 'a', asize))); + ASSERT_FORTIFY(printf("%s", static_cast<const char*>(memchr(myfoo.a, 'a', asize)))); + ASSERT_FORTIFY(printf( + "%s", static_cast<const char*>(memchr(static_cast<const void*>(myfoo.a), 'a', asize)))); #else // __BIONIC__ GTEST_SKIP() << "glibc is broken"; #endif // __BIONIC__ @@ -216,8 +217,9 @@ TEST_F(DEATHTEST, memrchr_fortified2) { foo myfoo; volatile int asize = sizeof(myfoo.a) + 1; memcpy(myfoo.a, "0123456789", sizeof(myfoo.a)); - ASSERT_FORTIFY(printf("%s", memrchr(myfoo.a, 'a', asize))); - ASSERT_FORTIFY(printf("%s", memrchr(static_cast<const void*>(myfoo.a), 'a', asize))); + ASSERT_FORTIFY(printf("%s", static_cast<const char*>(memrchr(myfoo.a, 'a', asize)))); + ASSERT_FORTIFY(printf( + "%s", static_cast<const char*>(memrchr(static_cast<const void*>(myfoo.a), 'a', asize)))); #else // __BIONIC__ GTEST_SKIP() << "glibc is broken"; #endif // __BIONIC__ |