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

Unified Diff: base/allocator/allocator_interception_mac.mm

Issue 2674653004: Fix an ASAN compile error in AllocatorInterceptionMac. (Closed)
Patch Set: Created 3 years, 11 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/allocator/allocator_interception_mac.mm
diff --git a/base/allocator/allocator_interception_mac.mm b/base/allocator/allocator_interception_mac.mm
index 431c2c79ce4ab876e556098a7cf7c52aeb4acc6d..be6c0fa4e9e7261012d2af6525d31fbee9986343 100644
--- a/base/allocator/allocator_interception_mac.mm
+++ b/base/allocator/allocator_interception_mac.mm
@@ -370,7 +370,9 @@ void StoreFunctionsForDefaultZone(MallocZoneFunctions* functions) {
void ReplaceFunctionsForDefaultZone(const MallocZoneFunctions* functions) {
CHECK(!g_replaced_default_zone);
g_replaced_default_zone = true;
+#if !defined(ADDRESS_SANITIZER)
StoreFunctionsForDefaultZone(&g_old_zone);
+#endif
ChromeMallocZone* default_zone = reinterpret_cast<ChromeMallocZone*>(
malloc_default_zone());
ReplaceZoneFunctions(default_zone, functions);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698