Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Unified Diff: trunk/src/chrome/app/chrome_exe_main_gtk.cc

Issue 215363006: Revert 259561 "Set the default ASan options for executables buil..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/build/common.gypi ('k') | trunk/src/components/nacl.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/app/chrome_exe_main_gtk.cc
===================================================================
--- trunk/src/chrome/app/chrome_exe_main_gtk.cc (revision 260036)
+++ trunk/src/chrome/app/chrome_exe_main_gtk.cc (working copy)
@@ -11,6 +11,31 @@
// order to make it easy to update the app from GoogleUpdate. We don't need
// that extra layer with on linux.
+#if defined(ADDRESS_SANITIZER) && defined(GOOGLE_CHROME_BUILD)
+// Default AddressSanitizer options for the official build. These do not affect
+// tests or non-official Chromium builds.
+// - disable the strict memcmp() checking (http://crbug.com/178677 and
+// http://crbug.com/178404).
+// - set the malloc_context_size (i.e. the size of stack traces collected by
+// ASan for each malloc/free) to 5. These stack traces tend to accumulate
+// very fast in applications using JIT (v8 in Chrome's case), see
+// https://code.google.com/p/address-sanitizer/issues/detail?id=177
+// - disable the in-process symbolization, which isn't 100% compatible with
+// the existing sandboxes and doesn't make much sense for stripped official
+// binaries.
+const char *kAsanDefaultOptions =
+ "malloc_context_size=5 strict_memcmp=0 symbolize=false";
+
+// Override the default ASan options for the Google Chrome executable.
+// __asan_default_options should not be instrumented, because it is called
+// before ASan is initialized.
+extern "C"
+__attribute__((no_sanitize_address))
+const char *__asan_default_options() {
+ return kAsanDefaultOptions;
+}
+#endif
+
extern "C" {
int ChromeMain(int argc, const char** argv);
}
« no previous file with comments | « trunk/src/build/common.gypi ('k') | trunk/src/components/nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698