diff --git a/compiler-rt/lib/asan/asan_rtl.cc b/compiler-rt/lib/asan/asan_rtl.cc index c3cc1d3f333f..d9874016f575 100644 --- a/compiler-rt/lib/asan/asan_rtl.cc +++ b/compiler-rt/lib/asan/asan_rtl.cc @@ -269,7 +269,7 @@ void InitializeFlags(Flags *f, const char *env) { f->allow_reexec = true; f->print_full_thread_history = true; f->poison_heap = true; - f->poison_array_cookie = true; + f->poison_array_cookie = false; f->poison_partial = true; // Turn off alloc/dealloc mismatch checker on Mac and Windows for now. // https://code.google.com/p/address-sanitizer/issues/detail?id=131 diff --git a/compiler-rt/test/asan/TestCases/Linux/new_array_cookie_test.cc b/compiler-rt/test/asan/TestCases/Linux/new_array_cookie_test.cc index 339120ba2d2b..49545f09355b 100644 --- a/compiler-rt/test/asan/TestCases/Linux/new_array_cookie_test.cc +++ b/compiler-rt/test/asan/TestCases/Linux/new_array_cookie_test.cc @@ -1,6 +1,6 @@ // REQUIRES: asan-64-bits -// RUN: %clangxx_asan -O0 %s -o %t && not %run %t 2>&1 | FileCheck %s -// RUN: %clangxx_asan -O3 %s -o %t && not %run %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -O3 %s -o %t +// RUN %run %t // RUN: ASAN_OPTIONS=poison_array_cookie=1 not %run %t 2>&1 | FileCheck %s // RUN: ASAN_OPTIONS=poison_array_cookie=0 %run %t #include