diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-10-06 00:22:47 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-10-06 00:22:47 +0000 |
commit | 4b13827fe449b3e1f8a2a6ae34a6905c92fdfd11 (patch) | |
tree | c49d26905bcc96dd0605345f8401509a8076e2a0 | |
parent | 2f297f9c395dc33cee5472aad2c09b0854b21408 (diff) | |
parent | 6aa3bdfb161af9c190df44efa1c3160fc6b71314 (diff) | |
download | bionic-4b13827fe449b3e1f8a2a6ae34a6905c92fdfd11.tar.gz |
Merge "Merge "stack_protector_DeathTest#modify_stack_protector: avoid flake." into android12-tests-dev am: 793d1fb5ab" into android12L-tests-dev am: 6aa3bdfb16
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2240186
Change-Id: I479c56a6509cef84a1f614a937a6434ebce5dbcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-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; } |