Do not call ReplaceCFAllocator() before __CFInitialize(), otherwise crashes are possi...

Fixes http://code.google.com/p/address-sanitizer/issues/detail?id=122

llvm-svn: 166029

diff --git a/compiler-rt/lib/asan/asan_mac.cc b/compiler-rt/lib/asan/asan_mac.cc
index 11b0a56..f3ea770 100644 (file)
--- a/compiler-rt/lib/asan/asan_mac.cc
+++ b/compiler-rt/lib/asan/asan_mac.cc
@@ -131,7 +131,14 @@ bool AsanInterceptsSignal(int signum) {
 }
 
 void AsanPlatformThreadInit() {
-  ReplaceCFAllocator();
+  // For the first program thread, we can't replace the allocator before
+  // __CFInitialize() has been called. If it hasn't, we'll call
+  // ReplaceCFAllocator() later on this thread.
+  // For other threads __CFInitialize() has been called before their creation.
+  // See also asan_malloc_mac.cc.
+  if (((CFRuntimeBase*)kCFAllocatorSystemDefault)->_cfisa) {
+    ReplaceCFAllocator();
+  }
 }
 
 AsanLock::AsanLock(LinkerInitialized) {