diff options
author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 14:38:43 +0000 |
---|---|---|
committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 14:38:43 +0000 |
commit | 7f0944eb2e8e1af647e24634be25b86956eaef51 (patch) | |
tree | 1329bcbcc82eae00794d3ce7cdbd8aeab42d2341 /base/process_util_mac.mm | |
parent | 38c2783457a65c46b41f6d2d0b83429ab6036171 (diff) | |
download | chromium_src-7f0944eb2e8e1af647e24634be25b86956eaef51.zip chromium_src-7f0944eb2e8e1af647e24634be25b86956eaef51.tar.gz chromium_src-7f0944eb2e8e1af647e24634be25b86956eaef51.tar.bz2 |
Disable EnableTerminationOnHeapCorruption() on Mac under AddressSanitizer.
Review URL: http://codereview.chromium.org/8503013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109023 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/process_util_mac.mm')
-rw-r--r-- | base/process_util_mac.mm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/base/process_util_mac.mm b/base/process_util_mac.mm index 5519d21..2d8bde4 100644 --- a/base/process_util_mac.mm +++ b/base/process_util_mac.mm @@ -555,6 +555,11 @@ void CrMallocErrorBreak() { } // namespace void EnableTerminationOnHeapCorruption() { +#ifdef ADDRESS_SANITIZER + // Don't do anything special on heap corruption, because it should be handled + // by AddressSanitizer. + return; +#endif malloc_error_break_t malloc_error_break = LookUpMallocErrorBreak(); if (!malloc_error_break) { DLOG(WARNING) << "Could not find malloc_error_break"; |