summaryrefslogtreecommitdiffstats
path: root/build/sanitizers/sanitizer_options.cc
diff options
context:
space:
mode:
authorinferno <inferno@chromium.org>2015-04-08 09:57:47 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-08 16:58:20 +0000
commitd4a43f2240f2ea3332a2a9f552e7983e8b61c301 (patch)
tree11600bf100a60590a5197d624789e55984f76baa /build/sanitizers/sanitizer_options.cc
parenta83e4009197f14936d4b53a9e5702ff145f3a8c9 (diff)
downloadchromium_src-d4a43f2240f2ea3332a2a9f552e7983e8b61c301.zip
chromium_src-d4a43f2240f2ea3332a2a9f552e7983e8b61c301.tar.gz
chromium_src-d4a43f2240f2ea3332a2a9f552e7983e8b61c301.tar.bz2
Revert of Disable container overflow check on Linux and Mac. (patchset #2 id:20001 of https://codereview.chromium.org/951083002/)
Reason for revert: Container overflow is stable on linux, we can safely revert it. Original issue's description: > Disable container overflow check on Linux and Mac. > > BUG=459632 > TBR=glider@chromium.org > NOTRY=true > > Committed: https://crrev.com/6c3ce96dedaf8f23fce9cbd9c5279fe20c531ac6 > Cr-Commit-Position: refs/heads/master@{#317681} TBR=marcheu@chromium.org,glider@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=459632 Review URL: https://codereview.chromium.org/1069793002 Cr-Commit-Position: refs/heads/master@{#324235}
Diffstat (limited to 'build/sanitizers/sanitizer_options.cc')
-rw-r--r--build/sanitizers/sanitizer_options.cc10
1 files changed, 3 insertions, 7 deletions
diff --git a/build/sanitizers/sanitizer_options.cc b/build/sanitizers/sanitizer_options.cc
index 33090fb..6668c1e 100644
--- a/build/sanitizers/sanitizer_options.cc
+++ b/build/sanitizers/sanitizer_options.cc
@@ -66,8 +66,6 @@ void _sanitizer_options_link_helper() { }
// so the slow unwinder may not work properly.
// detect_stack_use_after_return=1 - use fake stack to delay the reuse of
// stack allocations and detect stack-use-after-return errors.
-// detect_container_overflow=0 - do not detect overflows in containers
-// until crbug.com/459632 is fixed.
#if defined(OS_LINUX)
#if defined(GOOGLE_CHROME_BUILD)
// Default AddressSanitizer options for the official build. These do not affect
@@ -76,22 +74,20 @@ void _sanitizer_options_link_helper() { }
const char kAsanDefaultOptions[] =
"legacy_pthread_cond=1 malloc_context_size=5 strict_memcmp=0 "
"symbolize=false check_printf=1 use_sigaltstack=1 detect_leaks=0 "
- "strip_path_prefix=Release/../../ fast_unwind_on_fatal=1 "
- "detect_container_overflow=0 ";
+ "strip_path_prefix=Release/../../ fast_unwind_on_fatal=1";
#else
// Default AddressSanitizer options for buildbots and non-official builds.
const char *kAsanDefaultOptions =
"strict_memcmp=0 symbolize=false check_printf=1 use_sigaltstack=1 "
"detect_leaks=0 strip_path_prefix=Release/../../ fast_unwind_on_fatal=1 "
- "detect_stack_use_after_return=1 detect_container_overflow=0 ";
+ "detect_stack_use_after_return=1 ";
#endif // GOOGLE_CHROME_BUILD
#elif defined(OS_MACOSX)
const char *kAsanDefaultOptions =
"strict_memcmp=0 replace_intrin=0 check_printf=1 use_sigaltstack=1 "
"strip_path_prefix=Release/../../ fast_unwind_on_fatal=1 "
- "detect_stack_use_after_return=1 detect_odr_violation=0 "
- "detect_container_overflow=0 ";
+ "detect_stack_use_after_return=1 detect_odr_violation=0 ";
static const char kNaClDefaultOptions[] = "handle_segv=0";
static const char kNaClFlag[] = "--type=nacl-loader";
#endif // OS_LINUX