OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "build/build_config.h" | 5 #include "build/build_config.h" |
6 #include "chrome/browser/first_run/upgrade_util.h" | 6 #include "chrome/browser/first_run/upgrade_util.h" |
7 | 7 |
8 // The entry point for all invocations of Chromium, browser and renderer. On | 8 // The entry point for all invocations of Chromium, browser and renderer. On |
9 // windows, this does nothing but load chrome.dll and invoke its entry point in | 9 // windows, this does nothing but load chrome.dll and invoke its entry point in |
10 // order to make it easy to update the app from GoogleUpdate. We don't need | 10 // order to make it easy to update the app from GoogleUpdate. We don't need |
11 // that extra layer with on linux. | 11 // that extra layer with on linux. |
12 | 12 |
13 #if defined(ADDRESS_SANITIZER) && defined(GOOGLE_CHROME_BUILD) | 13 #if defined(ADDRESS_SANITIZER) && defined(GOOGLE_CHROME_BUILD) |
14 const char *kAsanDefaultOptions = "quarantine_size=1048576"; | 14 // Default AddressSanitizer options: limit the quarantine to 1Gb, disable the |
| 15 // strict memcmp() checking (http://crbug.com/178677 and |
| 16 // http://crbug.com/178404). |
| 17 const char *kAsanDefaultOptions = "quarantine_size=1048576 strict_memcmp=0"; |
15 | 18 |
16 // Override the default ASan options for the Google Chrome executable. | 19 // Override the default ASan options for the Google Chrome executable. |
17 // __asan_default_options should not be instrumented, because it is called | 20 // __asan_default_options should not be instrumented, because it is called |
18 // before ASan is initialized. | 21 // before ASan is initialized. |
19 extern "C" | 22 extern "C" |
20 __attribute__((no_address_safety_analysis)) | 23 __attribute__((no_address_safety_analysis)) |
21 const char *__asan_default_options() { | 24 const char *__asan_default_options() { |
22 return kAsanDefaultOptions; | 25 return kAsanDefaultOptions; |
23 } | 26 } |
24 #endif | 27 #endif |
25 | 28 |
26 extern "C" { | 29 extern "C" { |
27 int ChromeMain(int argc, const char** argv); | 30 int ChromeMain(int argc, const char** argv); |
28 } | 31 } |
29 | 32 |
30 int main(int argc, const char** argv) { | 33 int main(int argc, const char** argv) { |
31 int return_code = ChromeMain(argc, argv); | 34 int return_code = ChromeMain(argc, argv); |
32 | 35 |
33 #if defined(OS_LINUX) | 36 #if defined(OS_LINUX) |
34 // Launch a new instance if we're shutting down because we detected an | 37 // Launch a new instance if we're shutting down because we detected an |
35 // upgrade in the persistent mode. | 38 // upgrade in the persistent mode. |
36 upgrade_util::RelaunchChromeBrowserWithNewCommandLineIfNeeded(); | 39 upgrade_util::RelaunchChromeBrowserWithNewCommandLineIfNeeded(); |
37 #endif | 40 #endif |
38 | 41 |
39 return return_code; | 42 return return_code; |
40 } | 43 } |
OLD | NEW |