diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-10-06 20:27:57 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-10-06 20:27:57 +0000 |
commit | b5a74d5d37f41d9ce4983c15c9c11f691f848850 (patch) | |
tree | ec7eaf7308d22f592a0ca98737897d801df40d7b | |
parent | e41878709ff813075ac1f80e6e718407a5f618dd (diff) | |
parent | bce2d9e90b4fa86050ca75f2a35fcf01b56a855f (diff) | |
download | bionic-android12-tests-release.tar.gz |
Merge "Snap for 9143886 from 793d1fb5ab5e038332f7c54647bea507a094910f to android12-tests-release" into android12-tests-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android12-tests-release
-rw-r--r-- | tests/stack_protector_test_helper.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/stack_protector_test_helper.cpp b/tests/stack_protector_test_helper.cpp index fd90b939b..eddd94074 100644 --- a/tests/stack_protector_test_helper.cpp +++ b/tests/stack_protector_test_helper.cpp @@ -19,7 +19,8 @@ __attribute__((noinline)) void modify_stack_protector_test() { // We can't use memset here because it's fortified, and we want to test // the line of defense *after* that. // Without volatile, the generic x86/x86-64 targets don't write to the stack. - volatile char* p; - p = reinterpret_cast<volatile char*>(&p + 1); - *p = '\0'; + // We can't make a constant change, since the existing byte might already have + // had that value. + volatile char* p = reinterpret_cast<volatile char*>(&p + 1); + *p = ~*p; } |