From fa79cd65e2a08979c0d76b6f0dec6192161e5611 Mon Sep 17 00:00:00 2001
From: Kostya Serebryany <kcc@google.com>
Date: Fri, 25 Jan 2013 11:46:22 +0000
Subject: [sanitizer] fix calloc overflow in asan/tsan/msan

llvm-svn: 173441
---
 compiler-rt/lib/asan/asan_allocator2.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'compiler-rt/lib/asan/asan_allocator2.cc')

diff --git a/compiler-rt/lib/asan/asan_allocator2.cc b/compiler-rt/lib/asan/asan_allocator2.cc
index 7bfa5fd24b2..184627a586a 100644
--- a/compiler-rt/lib/asan/asan_allocator2.cc
+++ b/compiler-rt/lib/asan/asan_allocator2.cc
@@ -607,6 +607,7 @@ void *asan_malloc(uptr size, StackTrace *stack) {
 }
 
 void *asan_calloc(uptr nmemb, uptr size, StackTrace *stack) {
+  if (CallocShouldReturnNullDueToOverflow(size, nmemb)) return 0;
   void *ptr = Allocate(nmemb * size, 8, stack, FROM_MALLOC);
   if (ptr)
     REAL(memset)(ptr, 0, nmemb * size);
-- 
cgit v1.2.1