[llvm-commits] [compiler-rt] r159824 - /compiler-rt/trunk/lib/asan/asan_malloc_mac.cc

[Alexander Potapenko]

Author: glider
Date: Fri Jul  6 08:52:28 2012
New Revision: 159824

URL: http://llvm.org/viewvc/llvm-project?rev=159824&view=rev
Log:
Small fix: do not replace the default CFAllocator if it has been replaced already.

Modified:
    compiler-rt/trunk/lib/asan/asan_malloc_mac.cc

Modified: compiler-rt/trunk/lib/asan/asan_malloc_mac.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_malloc_mac.cc?rev=159824&r1=159823&r2=159824&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_malloc_mac.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_malloc_mac.cc Fri Jul  6 08:52:28 2012
@@ -98,7 +98,7 @@
   CHECK(FLAG_replace_cfallocator);
   CHECK(asan_inited);
   REAL(__CFInitialize)();
-  ReplaceCFAllocator();
+  if (!cf_asan) ReplaceCFAllocator();
 }
 
 namespace {