diff options
| author | Yabin Cui <yabinc@google.com> | 2014-12-12 01:38:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-12 01:38:33 +0000 |
| commit | 6d634f9baaf804a91c97e019c832c1e9611a903a (patch) | |
| tree | d7423d22bfdb08291ddbacba72b2a24ac6e18e36 | |
| parent | 3115b34c9299d69919de39d01bfbbbe5e798e3b2 (diff) | |
| parent | 562ae1e6e42e83f674507d2b915deb503200befe (diff) | |
| download | android_bionic-6d634f9baaf804a91c97e019c832c1e9611a903a.tar.gz android_bionic-6d634f9baaf804a91c97e019c832c1e9611a903a.tar.bz2 android_bionic-6d634f9baaf804a91c97e019c832c1e9611a903a.zip | |
Merge "make stack_protector_DeathTest work for gcc4.9"
| -rw-r--r-- | tests/stack_protector_test.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/stack_protector_test.cpp b/tests/stack_protector_test.cpp index aad51ecff..80077113b 100644 --- a/tests/stack_protector_test.cpp +++ b/tests/stack_protector_test.cpp @@ -106,10 +106,16 @@ extern "C" uintptr_t __stack_chk_guard; * This must be marked with "__attribute__ ((noinline))", to ensure the * compiler generates the proper stack guards around this function. */ +static char* dummy_buf; + __attribute__ ((noinline)) static void do_modify_stack_chk_guard() { + char buf[128]; + // Store local array's address to global variable to force compiler to generate stack guards. + dummy_buf = buf; __stack_chk_guard = 0x12345678; } + #endif TEST(stack_protector, global_guard) { |