tsan: Go language support

llvm-svn: 159754

1 files changed, 6 insertions, 1 deletions

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc b/compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc
index be2f94c8dd2..816fddf1c5a 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc
@@ -31,13 +31,18 @@ namespace __sanitizer {
 const u64 kBlockMagic = 0x6A6CB03ABCEBC041ull;
 
 void *InternalAlloc(uptr size) {
+  if (size + sizeof(u64) < size)
+    return 0;
   void *p = LIBC_MALLOC(size + sizeof(u64));
+  if (p == 0)
+    return 0;
   ((u64*)p)[0] = kBlockMagic;
   return (char*)p + sizeof(u64);
 }
 
 void InternalFree(void *addr) {
-  if (!addr) return;
+  if (addr == 0)
+    return;
   addr = (char*)addr - sizeof(u64);
   CHECK_EQ(((u64*)addr)[0], kBlockMagic);
   ((u64*)addr)[0] = 0;