From 740d166c3e3ccfba8d9ae5cefc4a9a8541c109f2 Mon Sep 17 00:00:00 2001
From: Alexander Potapenko <glider@google.com>
Date: Fri, 6 Jul 2012 13:52:28 +0000
Subject: [PATCH] Small fix: do not replace the default CFAllocator if it has
 been replaced already.

llvm-svn: 159824
---
 compiler-rt/lib/asan/asan_malloc_mac.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler-rt/lib/asan/asan_malloc_mac.cc b/compiler-rt/lib/asan/asan_malloc_mac.cc
index 16e92017ce94..1626ebebbcbb 100644
--- a/compiler-rt/lib/asan/asan_malloc_mac.cc
+++ b/compiler-rt/lib/asan/asan_malloc_mac.cc
@@ -98,7 +98,7 @@ INTERCEPTOR(void, __CFInitialize) {
   CHECK(FLAG_replace_cfallocator);
   CHECK(asan_inited);
   REAL(__CFInitialize)();
-  ReplaceCFAllocator();
+  if (!cf_asan) ReplaceCFAllocator();
 }
 
 namespace {
-- 
GitLab